Merge pull request #115424 from siraben/darwin-mass-fix-buildInputs=0
commitaa3af1977451ab9e1d05a0451001bde98262b40a
authorSandro <sandro.jaeckel@gmail.com>
dateTue 9 Mar 2021, 21:14 (6 years ago)
parentaf48e830be95fb
pkgs/applications/audio/csa/default.nix+1−1
@@ -23,6 +23,6 @@ stdenv.mkDerivation rec {
2323 '';
2424 license = licenses.gpl3;
2525 maintainers = [ maintainers.magnetophon ];
26− platforms = platforms.linux;
26+ platforms = platforms.unix;
2727 };
2828}
pkgs/development/interpreters/ceptre/default.nix+1−1
@@ -20,6 +20,6 @@ stdenv.mkDerivation {
2020 description = "A linear logic programming language for modeling generative interactive systems";
2121 homepage = "https://github.com/chrisamaphone/interactive-lp";
2222 maintainers = with maintainers; [ pSub ];
23− platforms = with platforms; linux;
23+ platforms = platforms.unix;
2424 };
2525}
pkgs/development/interpreters/duktape/default.nix+9−1
@@ -8,6 +8,14 @@ stdenv.mkDerivation rec {
88 sha256 = "19szwxzvl2g65fw95ggvb8h0ma5bd9vvnnccn59hwnc4dida1x4n";
99 };
1010
11+ postPatch = ''
12+ substituteInPlace Makefile.sharedlibrary \
13+ --replace 'gcc' '${stdenv.cc.targetPrefix}cc' \
14+ --replace 'g++' '${stdenv.cc.targetPrefix}c++'
15+ substituteInPlace Makefile.cmdline \
16+ --replace 'gcc' '${stdenv.cc.targetPrefix}cc' \
17+ --replace 'g++' '${stdenv.cc.targetPrefix}c++'
18+ '';
1119 buildPhase = ''
1220 make -f Makefile.sharedlibrary
1321 make -f Makefile.cmdline
@@ -27,6 +35,6 @@ stdenv.mkDerivation rec {
2735 downloadPage = "https://duktape.org/download.html";
2836 license = licenses.mit;
2937 maintainers = [ maintainers.fgaz ];
30− platforms = platforms.linux;
38+ platforms = platforms.all;
3139 };
3240}
pkgs/development/libraries/backward-cpp/default.nix+1−1
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
2424 description = "Beautiful stack trace pretty printer for C++";
2525 homepage = "https://github.com/bombela/backward-cpp";
2626 license = licenses.mit;
27− platforms = platforms.linux;
27+ platforms = platforms.all;
2828 maintainers = with maintainers; [ cstrahan ];
2929 };
3030}
pkgs/development/libraries/brigand/default.nix+1−1
@@ -21,6 +21,6 @@ stdenv.mkDerivation {
2121 homepage = "https://github.com/edouarda/brigand";
2222 license = licenses.boost;
2323 maintainers = with maintainers; [ pmiddend ];
24− platforms = platforms.linux;
24+ platforms = platforms.all;
2525 };
2626}
pkgs/development/libraries/cminpack/default.nix+7−3
@@ -8,8 +8,12 @@ stdenv.mkDerivation rec {
88 sha256 = "17yh695aim508x1kn9zf6g13jxwk3pi3404h5ix4g5lc60hzs1rw";
99 };
1010
11− patchPhase = ''
12− sed -i s,/usr/local,$out, Makefile
11+ postPatch = ''
12+ substituteInPlace Makefile \
13+ --replace '/usr/local' '${placeholder "out"}' \
14+ --replace 'gcc' '${stdenv.cc.targetPrefix}cc' \
15+ --replace 'ranlib -t' '${stdenv.cc.targetPrefix}ranlib' \
16+ --replace 'ranlib' '${stdenv.cc.targetPrefix}ranlib'
1317 '';
1418
1519 preInstall = ''
@@ -20,7 +24,7 @@ stdenv.mkDerivation rec {
2024 homepage = "http://devernay.free.fr/hacks/cminpack/cminpack.html";
2125 license = lib.licenses.bsd3;
2226 description = "Software for solving nonlinear equations and nonlinear least squares problems";
23− platforms = lib.platforms.linux;
27+ platforms = lib.platforms.all;
2428 };
2529
2630}
pkgs/development/libraries/croaring/default.nix+1−1
@@ -23,6 +23,6 @@ stdenv.mkDerivation rec {
2323 homepage = "http://roaringbitmap.org/";
2424 license = licenses.asl20;
2525 maintainers = with maintainers; [ orivej ];
26− platforms = platforms.linux;
26+ platforms = platforms.all;
2727 };
2828}
pkgs/development/libraries/ethash/default.nix+1−1
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
4040 meta = with lib; {
4141 description = "PoW algorithm for Ethereum 1.0 based on Dagger-Hashimoto";
4242 homepage = "https://github.com/ethereum/ethash";
43− platforms = [ "x86_64-linux" ];
43+ platforms = platforms.unix;
4444 maintainers = with maintainers; [ nand0p ];
4545 license = licenses.asl20;
4646 };
pkgs/development/libraries/gensio/default.nix+1−1
@@ -34,6 +34,6 @@ stdenv.mkDerivation rec {
3434 homepage = "https://sourceforge.net/projects/ser2net/";
3535 license = licenses.gpl2;
3636 maintainers = with maintainers; [ emantor ];
37− platforms = with platforms; linux;
37+ platforms = platforms.unix;
3838 };
3939}
pkgs/development/libraries/lyra/default.nix+1−1
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
2525 meta = with lib; {
2626 homepage = "https://github.com/bfgroup/Lyra";
2727 description = "A simple to use, composable, command line parser for C++ 11 and beyond";
28− platforms = platforms.linux;
28+ platforms = platforms.unix;
2929 license = licenses.boost;
3030 maintainers = with maintainers; [ davidtwco ];
3131 };
pkgs/development/libraries/openpa/default.nix+1−1
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 homepage = "https://trac.mpich.org/projects/openpa";
1919 license = lib.licenses.mit;
2020 maintainers = with lib.maintainers; [ leenaars ];
21− platforms = with lib.platforms; linux;
21+ platforms = lib.platforms.unix;
2222 longDescription = ''
2323 OPA (or sometimes OpenPA or Open Portable Atomics) is an
2424 open source library intended to provide a consistent C API for performing
pkgs/development/tools/misc/rman/default.nix+3−2
@@ -10,7 +10,8 @@ stdenv.mkDerivation {
1010
1111 postPatch = ''
1212 substituteInPlace Makefile \
13− --replace ginstall install
13+ --replace ginstall install \
14+ --replace gcc '${stdenv.cc.targetPrefix}cc'
1415 '';
1516
1617 makeFlags = [ "BINDIR=$(out)/bin" "MANDIR=$(out)/share/man" ];
@@ -27,6 +28,6 @@ stdenv.mkDerivation {
2728 meta = {
2829 description = "Parse formatted man pages and man page source from most flavors of UNIX and converts them to HTML, ASCII, TkMan, DocBook, and other formats";
2930 license = "artistic";
30− platforms = lib.platforms.linux;
31+ platforms = lib.platforms.all;
3132 };
3233}
pkgs/development/tools/parsing/jikespg/default.nix+11−8
@@ -1,25 +1,28 @@
11{lib, stdenv, fetchurl}:
22
33stdenv.mkDerivation rec {
4− name = "jikespg-1.3";
4+ pname = "jikespg";
5+ version = "1.3";
56
67 src = fetchurl {
7− url = "mirror://sourceforge/jikes/${name}.tar.gz";
8+ url = "mirror://sourceforge/jikes/${pname}-${version}.tar.gz";
89 sha256 = "083ibfxaiw1abxmv1crccx1g6sixkbyhxn2hsrlf6fwii08s6rgw";
910 };
1011
12+ postPatch = ''
13+ substituteInPlace Makefile --replace "gcc" "${stdenv.cc.targetPrefix}cc"
14+ '';
15+
1116 sourceRoot = "jikespg/src";
1217
13− installPhase =
14− ''
15− mkdir -p $out/bin
16− cp jikespg $out/bin
17− '';
18+ installPhase = ''
19+ install -Dm755 -t $out/bin jikespg
20+ '';
1821
1922 meta = with lib; {
2023 homepage = "http://jikes.sourceforge.net/";
2124 description = "The Jikes Parser Generator";
22− platforms = platforms.linux;
25+ platforms = platforms.all;
2326 license = licenses.ipl10;
2427 maintainers = with maintainers; [ pSub ];
2528 };
pkgs/tools/networking/ripmime/default.nix+3−2
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl }:
1+{ lib, stdenv, fetchurl, libiconv }:
22
33stdenv.mkDerivation rec {
44 pname = "ripmime";
@@ -8,6 +8,7 @@ stdenv.mkDerivation rec {
88 sha256 = "0sj06ibmlzy34n8v0mnlq2gwidy7n2aqcwgjh0xssz3vi941aqc9";
99 };
1010
11+ buildInputs = [ libiconv ];
1112 preInstall = ''
1213 sed -i Makefile -e "s@LOCATION=.*@LOCATION=$out@" -e "s@man/man1@share/&@"
1314 mkdir -p "$out/bin" "$out/share/man/man1"
@@ -19,7 +20,7 @@ stdenv.mkDerivation rec {
1920 description = "Attachment extractor for MIME messages";
2021 maintainers = with maintainers; [ raskin ];
2122 homepage = "http://www.pldaniels.com/ripmime/";
22− platforms = platforms.linux;
23+ platforms = platforms.all;
2324 };
2425
2526 passthru = {
pkgs/tools/security/hashcat-utils/default.nix+1−1
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
2424 description = "Small utilities that are useful in advanced password cracking";
2525 homepage = "https://github.com/hashcat/hashcat-utils";
2626 license = licenses.mit;
27− platforms = platforms.linux;
27+ platforms = platforms.unix;
2828 maintainers = with maintainers; [ fadenb ];
2929 };
3030}
pkgs/tools/security/wipe/default.nix+1−1
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 description = "Secure file wiping utility";
1616 homepage = "http://wipe.sourceforge.net/";
1717 license = licenses.gpl2;
18− platforms = platforms.linux;
18+ platforms = platforms.all;
1919 maintainers = [ maintainers.abbradar ];
2020 };
2121}
pkgs/tools/system/uptimed/default.nix+1−1
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
2424 '';
2525 homepage = "https://github.com/rpodgorny/uptimed/";
2626 license = licenses.gpl2;
27− platforms = platforms.linux;
27+ platforms = platforms.unix;
2828 };
2929
3030}