Merge pull request #115974 from siraben/darwin-mass-fix-buildInputs=0-alt

2024-11-24 07:53:19 +00:00 · 2021-03-13 19:42:55 +01:00 · 2021-03-13 19:42:55 +01:00 · 12de0d4c91
commit 12de0d4c91
parent c30a9fd946 9706a8d8d1
33 changed files with 57 additions and 37 deletions
--- a/pkgs/development/guile-modules/guile-opengl/default.nix
+++ b/pkgs/development/guile-modules/guile-opengl/default.nix
@ -18,6 +18,6 @@ in stdenv.mkDerivation {
    homepage = "https://www.gnu.org/software/guile-opengl/";
    license = licenses.gpl3Plus;
    maintainers = with maintainers; [ vyp ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
  };
 }
--- a/pkgs/development/libraries/clucene-core/default.nix
+++ b/pkgs/development/libraries/clucene-core/default.nix
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
      CLucene is a port of the very popular Java Lucene text search engine API.
    '';
    homepage = "http://clucene.sourceforge.net";
-    platforms = platforms.linux;
+    platforms = platforms.unix;
    license = with licenses; [ asl20 lgpl2 ];
  };
 }
--- a/pkgs/development/libraries/gtkdatabox/default.nix
+++ b/pkgs/development/libraries/gtkdatabox/default.nix
@ -17,6 +17,6 @@ stdenv.mkDerivation rec {

    license = lib.licenses.lgpl2;

-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.unix;
  };
 }
--- a/pkgs/development/libraries/htmlcxx/default.nix
+++ b/pkgs/development/libraries/htmlcxx/default.nix
@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl }:
+{ lib, stdenv, fetchurl, libiconv }:

 stdenv.mkDerivation rec {
  pname = "htmlcxx";
@ -9,12 +9,13 @@ stdenv.mkDerivation rec {
    sha256 = "1hgmyiad3qgbpf2dvv2jygzj6jpz4dl3n8ds4nql68a4l9g2nm07";
  };

+  buildInputs = [ libiconv ];
  patches = [ ./ptrdiff.patch ];

  meta = with lib; {
    homepage = "http://htmlcxx.sourceforge.net/";
    description = "A simple non-validating css1 and html parser for C++";
    license = licenses.lgpl2;
-    platforms = platforms.linux;
+    platforms = platforms.all;
  };
 }
--- a/pkgs/development/libraries/kissfft/default.nix
+++ b/pkgs/development/libraries/kissfft/default.nix
@ -30,6 +30,11 @@ stdenv.mkDerivation rec {
    })
  ];

+  postPatch = ''
+    substituteInPlace Makefile \
+      --replace "gcc" "${stdenv.cc.targetPrefix}cc" \
+      --replace "ar" "${stdenv.cc.targetPrefix}ar"
+  '';
  makeFlags = [
    "PREFIX=${placeholder "out"}"
    "DATATYPE=double"
@ -40,6 +45,6 @@ stdenv.mkDerivation rec {
    homepage = "https://github.com/mborgerding/kissfft";
    license = licenses.bsd3;
    maintainers = [ maintainers.goibhniu ];
-    platforms = platforms.linux;
+    platforms = platforms.all;
  };
 }
--- a/pkgs/development/libraries/levmar/default.nix
+++ b/pkgs/development/libraries/levmar/default.nix
@ -9,8 +9,9 @@ stdenv.mkDerivation rec {
  };

  patchPhase = ''
-    sed -i 's/define HAVE_LAPACK/undef HAVE_LAPACK/' levmar.h
+    substituteInPlace levmar.h --replace "define HAVE_LAPACK" "undef HAVE_LAPACK"
    sed -i 's/LAPACKLIBS=.*/LAPACKLIBS=/' Makefile
+    substituteInPlace Makefile --replace "gcc" "${stdenv.cc.targetPrefix}cc"
  '';

  installPhase = ''
@ -23,6 +24,6 @@ stdenv.mkDerivation rec {
    description = "ANSI C implementations of Levenberg-Marquardt, usable also from C++";
    homepage = "https://www.ics.forth.gr/~lourakis/levmar/";
    license = lib.licenses.gpl2Plus;
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.all;
  };
 }
--- a/pkgs/development/libraries/libcec/platform.nix
+++ b/pkgs/development/libraries/libcec/platform.nix
@ -18,7 +18,7 @@ stdenv.mkDerivation {
    homepage = "https://github.com/Pulse-Eight/platform";
    repositories.git = "https://github.com/Pulse-Eight/platform.git";
    license = lib.licenses.gpl2Plus;
-    platforms = platforms.linux;
+    platforms = platforms.all;
    maintainers = [ maintainers.titanous ];
  };
 }
--- a/pkgs/development/libraries/libcli/default.nix
+++ b/pkgs/development/libraries/libcli/default.nix
@ -20,12 +20,12 @@ stdenv.mkDerivation rec {

  enableParallelBuilding = true;

-  makeFlags = [ "PREFIX=$(out)" ];
+  makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "AR=${stdenv.cc.targetPrefix}ar" "PREFIX=$(out)" ];

  meta = with lib; {
    description = "Emulate a Cisco-style telnet command-line interface";
    homepage = "http://sites.dparrish.com/libcli";
    license = licenses.lgpl21Plus;
-    platforms = platforms.linux;
+    platforms = platforms.all;
  };
 }
--- a/pkgs/development/libraries/libcredis/default.nix
+++ b/pkgs/development/libraries/libcredis/default.nix
@ -23,7 +23,7 @@ stdenv.mkDerivation {
    description = "C client library for Redis (key-value database)";
    homepage = "https://code.google.com/archive/p/credis/";
    license = licenses.bsd3; # from homepage
-    platforms = platforms.linux;
+    platforms = platforms.all;
    maintainers = [ maintainers.bjornfor ];
  };
 }
--- a/pkgs/development/libraries/libcsptr/default.nix
+++ b/pkgs/development/libraries/libcsptr/default.nix
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
    description = "Smart pointer constructs for the (GNU) C programming language";
    homepage = "https://github.com/Snaipe/libcsptr";
    license = licenses.mit;
-    platforms = [ "i686-linux" "x86_64-linux" ];
+    platforms = platforms.all;
    maintainers = [ maintainers.fragamus ];
  };
 }
--- a/pkgs/development/libraries/liblcf/default.nix
+++ b/pkgs/development/libraries/liblcf/default.nix
@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
    homepage = "https://github.com/EasyRPG/liblcf";
    license = licenses.mit;
    maintainers = with maintainers; [ yegortimoshenko ];
-    platforms = platforms.linux;
+    platforms = platforms.all;
  };
 }
--- a/pkgs/development/libraries/libnatpmp/default.nix
+++ b/pkgs/development/libraries/libnatpmp/default.nix
@ -10,6 +10,12 @@ stdenv.mkDerivation rec {
    sha256 = "1c1n8n7mp0amsd6vkz32n8zj3vnsckv308bb7na0dg0r8969rap1";
  };

+  postPatch = ''
+    substituteInPlace Makefile \
+      --replace "gcc" "${stdenv.cc.targetPrefix}cc" \
+      --replace "ar" "${stdenv.cc.targetPrefix}ar"
+  '';
+
  makeFlags = [ "INSTALLPREFIX=$(out)" ];

  meta = with lib; {
@ -17,6 +23,6 @@ stdenv.mkDerivation rec {
    description = "NAT-PMP client";
    license = licenses.bsd3;
    maintainers = with maintainers; [ orivej ];
-    platforms = platforms.linux;
+    platforms = platforms.all;
  };
 }
--- a/pkgs/development/libraries/libnest2d/default.nix
+++ b/pkgs/development/libraries/libnest2d/default.nix
@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
      "2D irregular bin packaging and nesting library written in modern C++";
    homepage = "https://github.com/Ultimaker/libnest2d";
    license = licenses.lgpl3;
-    platforms = platforms.linux;
+    platforms = platforms.all;
  };
 }
--- a/pkgs/development/libraries/liboauth/default.nix
+++ b/pkgs/development/libraries/liboauth/default.nix
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
  '';

  meta = with lib; {
-    platforms = platforms.linux;
+    platforms = platforms.all;
    description = "C library implementing the OAuth secure authentication protocol";
    homepage = "http://liboauth.sourceforge.net/";
    repositories.git = "https://github.com/x42/liboauth.git";
--- a/pkgs/development/libraries/libxmi/default.nix
+++ b/pkgs/development/libraries/libxmi/default.nix
@ -15,7 +15,7 @@ stdenv.mkDerivation {
    description = "Library for rasterizing 2-D vector graphics";
    homepage = "https://www.gnu.org/software/libxmi/";
    license = lib.licenses.gpl2Plus;
-    platforms = lib.platforms.gnu ++ lib.platforms.linux;  # arbitrary choice
+    platforms = lib.platforms.unix;
    maintainers = [ ];
  };
 }
--- a/pkgs/development/libraries/libxmp/default.nix
+++ b/pkgs/development/libraries/libxmp/default.nix
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
      Scream Tracker 3 (S3M), Fast Tracker II (XM), and Impulse Tracker (IT).
    '';
    license     = licenses.lgpl21Plus;
-    platforms   = platforms.linux;
+    platforms   = platforms.all;
  };

  src = fetchurl {
--- a/pkgs/development/libraries/lightning/default.nix
+++ b/pkgs/development/libraries/lightning/default.nix
@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
    '';
    maintainers = [ maintainers.AndersonTorres ];
    license = licenses.lgpl3Plus;
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.all;
  };
 }
--- a/pkgs/development/libraries/loudmouth/default.nix
+++ b/pkgs/development/libraries/loudmouth/default.nix
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {

  meta = with lib; {
    description = "A lightweight C library for the Jabber protocol";
-    platforms = platforms.linux;
+    platforms = platforms.all;
    downloadPage = "http://mcabber.com/files/loudmouth/";
    downloadURLRegexp = "loudmouth-[0-9.]+[.]tar[.]bz2$";
    updateWalker = true;
--- a/pkgs/development/libraries/lrdf/default.nix
+++ b/pkgs/development/libraries/lrdf/default.nix
@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
    homepage = "https://sourceforge.net/projects/lrdf/";
    license = lib.licenses.gpl2;
    maintainers = [ lib.maintainers.marcweber ];
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.unix;
  };
 }
--- a/pkgs/development/libraries/metal/default.nix
+++ b/pkgs/development/libraries/metal/default.nix
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
    homepage = "https://github.com/brunocodutra/metal";
    license = licenses.mit;
    maintainers = with maintainers; [ pmiddend ];
-    platforms = platforms.linux;
+    platforms = platforms.all;
  };

 }
--- a/pkgs/development/libraries/minixml/default.nix
+++ b/pkgs/development/libraries/minixml/default.nix
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
    description = "A small XML library";
    homepage = "https://www.msweet.org/mxml/";
    license = licenses.asl20;
-    platforms = platforms.linux;
+    platforms = platforms.all;
    maintainers = [ maintainers.goibhniu ];
  };
 }
--- a/pkgs/development/libraries/msgpuck/default.nix
+++ b/pkgs/development/libraries/msgpuck/default.nix
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     description = "A simple and efficient MsgPack binary serialization library in a self-contained header file";
     homepage = "https://github.com/rtsisyk/msgpuck";
     license = licenses.bsd2;
-     platforms = platforms.linux;
+     platforms = platforms.all;
     maintainers = with maintainers; [ izorkin ];
 };
 }
--- a/pkgs/development/libraries/osip/default.nix
+++ b/pkgs/development/libraries/osip/default.nix
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
    homepage = "https://www.gnu.org/software/osip/";
    description = "The GNU oSIP library, an implementation of the Session Initiation Protocol (SIP)";
    maintainers = with lib.maintainers; [ raskin ];
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.all;
    inherit version;
  };
 }
--- a/pkgs/development/libraries/pxlib/default.nix
+++ b/pkgs/development/libraries/pxlib/default.nix
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
    description = "Library to read and write Paradox files";
    homepage = "http://pxlib.sourceforge.net/";
    license = licenses.gpl2;
-    platforms = platforms.linux;
+    platforms = platforms.all;
    maintainers = [ maintainers.winpat ];
  };
 }
--- a/pkgs/development/libraries/safefile/default.nix
+++ b/pkgs/development/libraries/safefile/default.nix
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
    description = "File open routines to safely open a file when in the presence of an attack";
    license = lib.licenses.asl20 ;
    maintainers = [lib.maintainers.raskin];
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.all;
    homepage = "https://research.cs.wisc.edu/mist/safefile/";
    updateWalker = true;
  };
--- a/pkgs/development/libraries/shhmsg/default.nix
+++ b/pkgs/development/libraries/shhmsg/default.nix
@ -8,13 +8,16 @@ stdenv.mkDerivation rec {
    sha256 = "0ax02fzqpaxr7d30l5xbndy1s5vgg1ag643c7zwiw2wj1czrxil8";
  };

+  postPatch = ''
+    substituteInPlace Makefile --replace "gcc" "${stdenv.cc.targetPrefix}cc"
+  '';
+
  installFlags = [ "INSTBASEDIR=$(out)" ];

  meta = with lib; {
    description = "A library for displaying messages";
    homepage = "https://shh.thathost.com/pub-unix/";
    license = licenses.artistic1;
-    platforms = platforms.linux;
+    platforms = platforms.all;
  };
 }
-
--- a/pkgs/development/libraries/shhopt/default.nix
+++ b/pkgs/development/libraries/shhopt/default.nix
@ -8,12 +8,16 @@ stdenv.mkDerivation rec {
    sha256 = "0yd6bl6qw675sxa81nxw6plhpjf9d2ywlm8a5z66zyjf28sl7sds";
  };

+  postPatch = ''
+    substituteInPlace Makefile --replace "gcc" "${stdenv.cc.targetPrefix}cc"
+  '';
+
  installFlags = [ "INSTBASEDIR=$(out)" ];

  meta = with lib; {
    description = "A library for parsing command line options";
    homepage = "https://shh.thathost.com/pub-unix/";
    license = licenses.artistic1;
-    platforms = platforms.linux;
+    platforms = platforms.all;
  };
 }
--- a/pkgs/development/libraries/spglib/default.nix
+++ b/pkgs/development/libraries/spglib/default.nix
@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
    homepage = "https://atztogo.github.io/spglib/";
    license = licenses.bsd3;
    maintainers = [ maintainers.markuskowa ];
-    platforms = platforms.linux;
+    platforms = platforms.all;
  };
 }
--- a/pkgs/development/libraries/spice-protocol/default.nix
+++ b/pkgs/development/libraries/spice-protocol/default.nix
@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
    homepage = "https://www.spice-space.org/";
    license = licenses.bsd3;
    maintainers = with maintainers; [ bluescreen303 ];
-    platforms = platforms.linux;
+    platforms = platforms.all;
  };
 }
--- a/pkgs/development/libraries/tidyp/default.nix
+++ b/pkgs/development/libraries/tidyp/default.nix
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
  meta = with lib; {
    description = "A program that can validate your HTML, as well as modify it to be more clean and standard";
    homepage = "http://tidyp.com/";
-    platforms = platforms.linux;
+    platforms = platforms.all;
    maintainers = with maintainers; [ pSub ];
    license = licenses.bsd3;
  };
--- a/pkgs/development/tools/analysis/coan/default.nix
+++ b/pkgs/development/tools/analysis/coan/default.nix
@ -28,6 +28,6 @@ stdenv.mkDerivation rec {
    '';
    homepage = "http://coan2.sourceforge.net/";
    license = licenses.bsd3;
-    platforms = platforms.linux;
+    platforms = platforms.all;
  };
 }
--- a/pkgs/development/tools/misc/pwndbg/default.nix
+++ b/pkgs/development/tools/misc/pwndbg/default.nix
@ -46,7 +46,7 @@ in stdenv.mkDerivation rec {
    description = "Exploit Development and Reverse Engineering with GDB Made Easy";
    homepage = "https://github.com/pwndbg/pwndbg";
    license = licenses.mit;
-    platforms = platforms.linux;
+    platforms = platforms.all;
    maintainers = with maintainers; [ mic92 ];
  };
 }
--- a/pkgs/games/vassal/default.nix
+++ b/pkgs/games/vassal/default.nix
@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
      homepage = "http://www.vassalengine.org/";
      license = licenses.lgpl21Only;
      maintainers = with maintainers; [ tvestelind ];
-      platforms = platforms.linux;
+      platforms = platforms.unix;
  };
 }