diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2021-03-03 17:58:53 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-03 17:58:53 +0100 |
commit | ce258a0664db139959ca29e12c7a87928ecbdee5 (patch) | |
tree | 418a46db30c7338a78d0ce49900e6f127840a9a9 | |
parent | e0a6314775cca8a617b791663fb76c0e108ea88e (diff) | |
parent | b79fb90a1c48c92e5b24c074e060b013aeccebc8 (diff) | |
download | nixpkgs-ce258a0664db139959ca29e12c7a87928ecbdee5.tar nixpkgs-ce258a0664db139959ca29e12c7a87928ecbdee5.tar.gz nixpkgs-ce258a0664db139959ca29e12c7a87928ecbdee5.tar.bz2 nixpkgs-ce258a0664db139959ca29e12c7a87928ecbdee5.tar.lz nixpkgs-ce258a0664db139959ca29e12c7a87928ecbdee5.tar.xz nixpkgs-ce258a0664db139959ca29e12c7a87928ecbdee5.tar.zst nixpkgs-ce258a0664db139959ca29e12c7a87928ecbdee5.zip |
Merge pull request #114976 from siraben/darwin-mass-fix-buildInputs=0
-rw-r--r-- | pkgs/development/compilers/4th/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/arachne-pnr/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/gprolog/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/miranda/default.nix | 1 | ||||
-rw-r--r-- | pkgs/development/compilers/muon/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/rasm/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/serpent/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/science/math/QuadProgpp/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/misc/0x0/default.nix | 1 | ||||
-rw-r--r-- | pkgs/tools/system/snooze/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/text/mpage/default.nix | 5 | ||||
-rw-r--r-- | pkgs/tools/text/numdiff/default.nix | 7 | ||||
-rw-r--r-- | pkgs/tools/text/uni2ascii/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/text/yaml-merge/default.nix | 2 |
14 files changed, 27 insertions, 18 deletions
diff --git a/pkgs/development/compilers/4th/default.nix b/pkgs/development/compilers/4th/default.nix index 7205a979e27..a8923879c06 100644 --- a/pkgs/development/compilers/4th/default.nix +++ b/pkgs/development/compilers/4th/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { makeFlags = [ "-C sources" - "CC=${stdenv.cc}/bin/cc" + "CC=${stdenv.cc.targetPrefix}cc" ]; preInstall = '' @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { description = "A portable Forth compiler"; homepage = "https://thebeez.home.xs4all.nl/4tH/index.html"; license = licenses.lgpl3; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/pkgs/development/compilers/arachne-pnr/default.nix b/pkgs/development/compilers/arachne-pnr/default.nix index 030da03add8..f537eb14d34 100644 --- a/pkgs/development/compilers/arachne-pnr/default.nix +++ b/pkgs/development/compilers/arachne-pnr/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/cseed/arachne-pnr"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ shell thoughtpolice ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/compilers/gprolog/default.nix b/pkgs/development/compilers/gprolog/default.nix index 59f33db68cb..87bf767f5bd 100644 --- a/pkgs/development/compilers/gprolog/default.nix +++ b/pkgs/development/compilers/gprolog/default.nix @@ -63,6 +63,6 @@ stdenv.mkDerivation rec { ''; maintainers = [ lib.maintainers.peti ]; - platforms = lib.platforms.gnu ++ lib.platforms.linux; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/compilers/miranda/default.nix b/pkgs/development/compilers/miranda/default.nix index ab34f833d75..5de16633ed7 100644 --- a/pkgs/development/compilers/miranda/default.nix +++ b/pkgs/development/compilers/miranda/default.nix @@ -70,5 +70,6 @@ stdenv.mkDerivation rec { homepage = "https://www.cs.kent.ac.uk/people/staff/dat/miranda/"; license = licenses.bsd2; maintainers = with maintainers; [ siraben ]; + platforms = platforms.all; }; } diff --git a/pkgs/development/compilers/muon/default.nix b/pkgs/development/compilers/muon/default.nix index 2e178f775b6..aef02bca970 100644 --- a/pkgs/development/compilers/muon/default.nix +++ b/pkgs/development/compilers/muon/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildPhase = '' mkdir -p $out/bin $out/share/mu cp -r lib $out/share/mu - gcc -O3 -o $out/bin/mu-unwrapped bootstrap/mu64.c + ${stdenv.cc.targetPrefix}cc -o $out/bin/mu-unwrapped bootstrap/mu64.c ''; installPhase = '' @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/nickmqb/muon"; license = licenses.mit; maintainers = with maintainers; [ Br1ght0ne ]; - platforms = [ "x86_64-linux" ]; + platforms = platforms.all; }; } diff --git a/pkgs/development/compilers/rasm/default.nix b/pkgs/development/compilers/rasm/default.nix index c2415899f6b..0feaabc92e6 100644 --- a/pkgs/development/compilers/rasm/default.nix +++ b/pkgs/development/compilers/rasm/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildPhase = '' # according to official documentation - cc rasm_v*.c -O2 -lm -lrt -o rasm + ${stdenv.cc.targetPrefix}cc rasm_v*.c -O2 -lm -o rasm ''; installPhase = '' @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { # use -n option to display all licenses license = licenses.mit; # expat version maintainers = [ ]; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/pkgs/development/compilers/serpent/default.nix b/pkgs/development/compilers/serpent/default.nix index 775a78a9734..fbcbf4485a4 100644 --- a/pkgs/development/compilers/serpent/default.nix +++ b/pkgs/development/compilers/serpent/default.nix @@ -14,6 +14,10 @@ stdenv.mkDerivation { sha256 = "1bns9wgn5i1ahj19qx7v1wwdy8ca3q3pigxwznm5nywsw7s7lqxs"; }; + postPatch = '' + substituteInPlace Makefile --replace 'g++' '${stdenv.cc.targetPrefix}c++' + ''; + installPhase = '' mkdir -p $out/bin mv serpent $out/bin @@ -33,6 +37,6 @@ stdenv.mkDerivation { homepage = "https://github.com/ethereum/wiki/wiki/Serpent"; license = with licenses; [ wtfpl ]; maintainers = with maintainers; [ chris-martin ]; - platforms = with platforms; linux; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/science/math/QuadProgpp/default.nix b/pkgs/development/libraries/science/math/QuadProgpp/default.nix index 254ce08dc60..703a7f2e344 100644 --- a/pkgs/development/libraries/science/math/QuadProgpp/default.nix +++ b/pkgs/development/libraries/science/math/QuadProgpp/default.nix @@ -12,7 +12,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ ]; meta = with lib; { homepage = "https://github.com/liuq/QuadProgpp"; @@ -22,6 +21,6 @@ stdenv.mkDerivation rec { Goldfarb-Idnani active-set dual method. ''; maintainers = with maintainers; [ ]; - platforms = with platforms; linux; + platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/0x0/default.nix b/pkgs/tools/misc/0x0/default.nix index 39cfcefaee8..0b9c6f7c3bb 100644 --- a/pkgs/tools/misc/0x0/default.nix +++ b/pkgs/tools/misc/0x0/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation { homepage = "https://gitlab.com/somasis/scripts/"; maintainers = [ maintainers.ar1a ]; license = licenses.unlicense; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/system/snooze/default.nix b/pkgs/tools/system/snooze/default.nix index 750a0954d3f..05c0b69c922 100644 --- a/pkgs/tools/system/snooze/default.nix +++ b/pkgs/tools/system/snooze/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { description = "Tool for waiting until a particular time and then running a command"; maintainers = with maintainers; [ kaction ]; license = licenses.cc0; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/text/mpage/default.nix b/pkgs/tools/text/mpage/default.nix index 9bde7f388dc..99cfec97a70 100644 --- a/pkgs/tools/text/mpage/default.nix +++ b/pkgs/tools/text/mpage/default.nix @@ -7,8 +7,9 @@ stdenv.mkDerivation rec { sha256 = "1zn37r5xrvjgjbw2bdkc0r7s6q8b1krmcryzj0yf0dyxbx79rasi"; }; - patchPhase = '' + postPatch = '' sed -i "Makefile" -e "s|^ *PREFIX *=.*$|PREFIX = $out|g" + substituteInPlace Makefile --replace 'gcc' '${stdenv.cc.targetPrefix}cc' ''; meta = { @@ -24,6 +25,6 @@ stdenv.mkDerivation rec { license = "liberal"; # a non-copyleft license, see `Copyright' file homepage = "http://www.mesa.nl/pub/mpage/"; - platforms = lib.platforms.linux; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/text/numdiff/default.nix b/pkgs/tools/text/numdiff/default.nix index db27c1bfd0c..317d29003cd 100644 --- a/pkgs/tools/text/numdiff/default.nix +++ b/pkgs/tools/text/numdiff/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, libintl }: stdenv.mkDerivation rec { @@ -9,6 +9,9 @@ stdenv.mkDerivation rec { url = "mirror://savannah/numdiff/numdiff-${version}.tar.gz"; sha256 = "1vzmjh8mhwwysn4x4m2vif7q2k8i19x8azq7pzmkwwj4g48lla47"; }; + + buildInputs = [ libintl ]; + meta = with lib; { description = '' A little program that can be used to compare putatively similar files @@ -18,6 +21,6 @@ stdenv.mkDerivation rec { homepage = "https://www.nongnu.org/numdiff/"; license = licenses.gpl3Plus; maintainers = with maintainers; []; - platforms = platforms.gnu ++ platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/text/uni2ascii/default.nix b/pkgs/tools/text/uni2ascii/default.nix index 19c95dcec63..e2bda04d13f 100644 --- a/pkgs/tools/text/uni2ascii/default.nix +++ b/pkgs/tools/text/uni2ascii/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { similar ASCII characters, e.g. by stripping diacritics. ''; maintainers = with lib.maintainers; [ goibhniu ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/text/yaml-merge/default.nix b/pkgs/tools/text/yaml-merge/default.nix index d36522edb87..7c4ecc49df5 100644 --- a/pkgs/tools/text/yaml-merge/default.nix +++ b/pkgs/tools/text/yaml-merge/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { description = "Merge YAML data files"; homepage = "https://github.com/abbradar/yaml-merge"; license = licenses.bsd2; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ abbradar ]; }; } |