Merge pull request #113295 from siraben/cc-eq-cc
commit41edfe8c2058418c6b49ba74942413d060c514df
authorSandro <sandro.jaeckel@gmail.com>
dateFri 19 Feb 2021, 19:25 (6 years ago)
parentb8e61684b2c44c
pkgs/applications/editors/jed/default.nix+1−1
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
2828 ];
2929
3030 configureFlags = [
31− "CC=cc"
31+ "CC=${stdenv.cc.targetPrefix}cc"
3232 "--with-slang=${slang}"
3333 "JED_ROOT=${placeholder "out"}/share/jed"
3434 ];
pkgs/applications/editors/viw/default.nix+1−1
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313
1414 buildInputs = [ ncurses ];
1515
16− makeFlags = [ "CC=cc" ];
16+ makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
1717 checkFlags = [ "test-command" "test-buffer" "test-state" ];
1818
1919 installPhase = ''
pkgs/applications/misc/gpscorrelate/default.nix+2−2
@@ -29,8 +29,8 @@ stdenv.mkDerivation rec {
2929
3030 makeFlags = [
3131 "prefix=${placeholder "out"}"
32− "CC=cc"
33− "CXX=c++"
32+ "CC=${stdenv.cc.targetPrefix}cc"
33+ "CXX=${stdenv.cc.targetPrefix}c++"
3434 "CFLAGS=-DENABLE_NLS"
3535 ];
3636
pkgs/applications/misc/tty-solitaire/default.nix+1−1
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515
1616 patchPhase = "sed -i -e '/^CFLAGS *?= *-g *$/d' Makefile";
1717
18− makeFlags = [ "CC=cc" "PREFIX=${placeholder "out"}" ];
18+ makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "PREFIX=${placeholder "out"}" ];
1919
2020 meta = with lib; {
2121 description = "Klondike Solitaire in your ncurses terminal";
pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix+1−1
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
2626 "DATA_ROOT_DIR_PURPLE=${placeholder "out"}/share"
2727 ];
2828
29− buildFlags = [ "CC=cc" ]; # fix build on darwin
29+ buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; # fix build on darwin
3030
3131 meta = with lib; {
3232 homepage = "https://github.com/matrix-org/purple-matrix";
pkgs/applications/science/biology/bcftools/default.nix+1−1
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 makeFlags = [
1515 "HSTDIR=${htslib}"
1616 "prefix=$(out)"
17− "CC=cc"
17+ "CC=${stdenv.cc.targetPrefix}cc"
1818 ];
1919
2020 preCheck = ''
pkgs/applications/science/biology/prodigal/default.nix+1−1
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
1212 };
1313
1414 makeFlags = [
15− "CC=cc"
15+ "CC=${stdenv.cc.targetPrefix}cc"
1616 "INSTALLDIR=$(out)/bin"
1717 ];
1818
pkgs/applications/science/math/gfan/default.nix+1−1
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 substituteInPlace Makefile --replace "-fno-guess-branch-probability" ""
1717 '';
1818
19− buildFlags = [ "CC=cc" "CXX=c++" ];
19+ buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "CXX=${stdenv.cc.targetPrefix}c++" ];
2020 installFlags = [ "PREFIX=$(out)" ];
2121 buildInputs = [ gmp mpir cddlib ];
2222
pkgs/applications/science/math/msieve/default.nix+1−1
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
1313 ECM = if ecm == null then "0" else "1";
1414
1515 # Doesn't hurt Linux but lets clang-based platforms like Darwin work fine too
16− makeFlags = [ "CC=cc" "all" ];
16+ makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "all" ];
1717
1818 installPhase = ''
1919 mkdir -p $out/bin/
pkgs/applications/science/math/ratpoints/default.nix+1−1
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919
2020 buildInputs = [ gmp ];
2121
22− makeFlags = [ "CC=cc" ];
22+ makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
2323 buildFlags = lib.optional stdenv.isDarwin ["CCFLAGS2=-lgmp -lc -lm" "CCFLAGS=-UUSE_SSE"];
2424 installFlags = [ "INSTALL_DIR=$(out)" ];
2525
pkgs/applications/video/kodi/default.nix+2−2
@@ -248,10 +248,10 @@ in stdenv.mkDerivation {
248248 # Need these tools on the build system when cross compiling,
249249 # hacky, but have found no other way.
250250 preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
251− CXX=c++ LD=ld make -C tools/depends/native/JsonSchemaBuilder
251+ CXX=${stdenv.cc.targetPrefix}c++ LD=ld make -C tools/depends/native/JsonSchemaBuilder
252252 cmakeFlags+=" -DWITH_JSONSCHEMABUILDER=$PWD/tools/depends/native/JsonSchemaBuilder/bin"
253253
254− CXX=c++ LD=ld make EXTRA_CONFIGURE= -C tools/depends/native/TexturePacker
254+ CXX=${stdenv.cc.targetPrefix}c++ LD=ld make EXTRA_CONFIGURE= -C tools/depends/native/TexturePacker
255255 cmakeFlags+=" -DWITH_TEXTUREPACKER=$PWD/tools/depends/native/TexturePacker/bin"
256256 '';
257257
pkgs/applications/window-managers/windowmaker/dockapps/wmsm-app.nix+1−1
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
2424 --replace "/usr/bin/install" "install"
2525 '';
2626
27− makeFlags = [ "CC=cc" ];
27+ makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
2828
2929 preInstall = ''
3030 runHook preInstall
pkgs/data/misc/tzdata/default.nix+1−1
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
4545 preInstall = ''
4646 mv zic.o zic.o.orig
4747 mv zic zic.orig
48− make $makeFlags cc=cc AR=ar zic
48+ make $makeFlags cc=${stdenv.cc.targetPrefix}cc AR=${stdenv.cc.targetPrefix}ar zic
4949 mv zic zic-native
5050 mv zic.o.orig zic.o
5151 mv zic.orig zic
pkgs/development/compilers/mosml/default.nix+1−1
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
66
77 buildInputs = [ gmp perl ];
88
9− makeFlags = [ "PREFIX=$(out)" ] ++ lib.optionals stdenv.isDarwin [ "CC=cc" ];
9+ makeFlags = [ "PREFIX=$(out)" "CC=${stdenv.cc.targetPrefix}cc" ];
1010
1111 src = fetchurl {
1212 url = "https://github.com/kfl/mosml/archive/ver-${version}.tar.gz";
pkgs/development/compilers/owl-lisp/default.nix+1−1
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313
1414 nativeBuildInputs = [ which ];
1515
16− makeFlags = [ "PREFIX=${placeholder "out"}" "CC=cc" ];
16+ makeFlags = [ "PREFIX=${placeholder "out"}" "CC=${stdenv.cc.targetPrefix}cc" ];
1717
1818 # tests are run as part of the compilation process
1919 doCheck = false;
pkgs/development/libraries/java/junixsocket/default.nix+1−1
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
2323 ANT_ARGS =
2424 # Note that our OpenJDK on Darwin is currently 32-bit, so we have to build a 32-bit dylib.
2525 (if stdenv.is64bit then [ "-Dskip32=true" ] else [ "-Dskip64=true" ])
26− ++ [ "-Dgcc=cc" "-Dant.build.javac.source=1.6" ]
26+ ++ [ "-Dgcc=${stdenv.cc.targetPrefix}cc" "-Dant.build.javac.source=1.6" ]
2727 ++ lib.optional stdenv.isDarwin "-DisMac=true";
2828
2929 installPhase =
pkgs/development/libraries/libav/default.nix+1−1
@@ -61,7 +61,7 @@ let
6161 "--enable-avplay"
6262 "--enable-shared"
6363 "--enable-runtime-cpudetect"
64− "--cc=cc"
64+ "--cc=${stdenv.cc.targetPrefix}cc"
6565 (enableFeature enableGPL "gpl")
6666 (enableFeature enableGPL "swscale")
6767 (enableFeature mp3Support "libmp3lame")
pkgs/development/libraries/mysocketw/default.nix+1−1
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
1616 --replace -Wl,-soname, -Wl,-install_name,$out/lib/
1717 '';
1818
19− makeFlags = [ "PREFIX=$(out)" "CXX=c++" ];
19+ makeFlags = [ "PREFIX=$(out)" "CXX=${stdenv.cc.targetPrefix}c++" ];
2020
2121 meta = {
2222 description = "Cross platform (Linux/FreeBSD/Unix/Win32) streaming socket C++";
pkgs/development/libraries/ntl/default.nix+1−1
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
4848 else
4949 "generic" # "chooses options that should be OK for most platforms"
5050 }"
51− "CXX=c++"
51+ "CXX=${stdenv.cc.targetPrefix}c++"
5252 ] ++ lib.optionals withGf2x [
5353 "NTL_GF2X_LIB=on"
5454 "GF2X_PREFIX=${gf2x}"
pkgs/development/libraries/odpic/default.nix+1−1
@@ -22,7 +22,7 @@ in stdenv.mkDerivation {
2222 ++ lib.optionals stdenv.isLinux [ libaio ];
2323
2424 dontPatchELF = true;
25− makeFlags = [ "PREFIX=$(out)" "CC=cc" "LD=cc"];
25+ makeFlags = [ "PREFIX=$(out)" "CC=${stdenv.cc.targetPrefix}cc" "LD=${stdenv.cc.targetPrefix}cc"];
2626
2727 postFixup = ''
2828 ${lib.optionalString (stdenv.isLinux) ''
pkgs/development/libraries/science/math/zn_poly/default.nix+1−1
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
3333 libbasename = "libzn_poly";
3434 libext = stdenv.targetPlatform.extensions.sharedLibrary;
3535
36− makeFlags = [ "CC=cc" ];
36+ makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
3737
3838 # Tuning (either autotuning or with hand-written paramters) is possible
3939 # but not implemented here.
pkgs/development/libraries/sonic/default.nix+1−1
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
1111 sha256 = "0ah54nizb6iwcx277w104wsfnx05vrp4sh56d2pfxhf8xghg54m6";
1212 };
1313
14− makeFlags = [ "PREFIX=${placeholder "out"}" "CC=cc" ];
14+ makeFlags = [ "PREFIX=${placeholder "out"}" "CC=${stdenv.cc.targetPrefix}cc" ];
1515
1616 nativeBuildInputs = [ installShellFiles ];
1717
pkgs/development/tools/misc/elfkickers/default.nix+1−1
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "02354yn1lh1dxny35ky2d0b44iq302krsqpwk5grr4glma00hhq6";
1010 };
1111
12− makeFlags = [ "CC=cc prefix=$(out)" ];
12+ makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc prefix=$(out)" ];
1313
1414 enableParallelBuilding = true;
1515
pkgs/development/tools/misc/micronucleus/default.nix+1−1
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717 };
1818
1919 buildInputs = [ libusb-compat-0_1 ];
20− makeFlags = lib.optionals stdenv.isDarwin [ "CC=cc" ];
20+ makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
2121
2222 installPhase = ''
2323 mkdir -p $out/bin
pkgs/development/tools/misc/sloccount/default.nix+1−1
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
3030 done
3131 '';
3232
33− makeFlags = [ "PREFIX=$(out)" "CC=cc" ];
33+ makeFlags = [ "PREFIX=$(out)" "CC=${stdenv.cc.targetPrefix}cc" ];
3434
3535 doCheck = true;
3636 checkPhase = ''HOME="$TMPDIR" PATH="$PWD:$PATH" make test'';
pkgs/development/tools/misc/stm32flash/default.nix+1−1
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
88 sha256 = "01p396daqw3zh6nijffbfbwyqza33bi2k4q3m5yjzs02xwi99alp";
99 };
1010
11− buildFlags = [ "CC=cc" ];
11+ buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
1212
1313 installPhase = ''
1414 # Manually copy, make install copies to /usr/local/bin
pkgs/games/assaultcube/default.nix+1−1
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
2222 buildInputs = [ file zlib ] ++ optionals client [ openal SDL SDL_image libogg libvorbis ];
2323
2424 targets = (optionalString server "server") + (optionalString client " client");
25− makeFlags = [ "-C source/src" "CXX=c++" targets ];
25+ makeFlags = [ "-C source/src" "CXX=${stdenv.cc.targetPrefix}c++" targets ];
2626
2727 desktop = makeDesktopItem {
2828 name = "AssaultCube";
pkgs/games/crawl/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv, lib, fetchFromGitHub, fetchpatch, which, sqlite, lua5_1, perl, python3, zlib, pkg-config, ncurses
22, dejavu_fonts, libpng, SDL2, SDL2_image, SDL2_mixer, libGLU, libGL, freetype, pngcrush, advancecomp
3−, tileMode ? false, enableSound ? tileMode
3+, tileMode ? false, enableSound ? tileMode, buildPackages
44
55# MacOS / Darwin builds
66, darwin ? null
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
4444
4545 fontsPath = lib.optionalString tileMode dejavu_fonts;
4646
47− makeFlags = [ "prefix=${placeholder "out"}" "FORCE_CC=cc" "FORCE_CXX=c++" "HOSTCXX=c++"
47+ makeFlags = [ "prefix=${placeholder "out"}" "FORCE_CC=${stdenv.cc.targetPrefix}cc" "FORCE_CXX=${stdenv.cc.targetPrefix}c++" "HOSTCXX=${buildPackages.stdenv.cc.targetPrefix}c++"
4848 "FORCE_PKGCONFIG=y"
4949 "SAVEDIR=~/.crawl" "sqlite=${sqlite.dev}"
5050 "DATADIR=${placeholder "out"}"
pkgs/games/nethack/default.nix+1−1
@@ -60,7 +60,7 @@ in stdenv.mkDerivation rec {
6060 -e 's,^WINTTYLIB=.*,WINTTYLIB=-lncurses,' \
6161 -i sys/unix/hints/linux
6262 sed \
63− -e 's,^CC=.*$,CC=cc,' \
63+ -e 's,^CC=.*$,CC=${stdenv.cc.targetPrefix}cc,' \
6464 -e 's,^HACKDIR=.*$,HACKDIR=\$(PREFIX)/games/lib/\$(GAME)dir,' \
6565 -e 's,^SHELLDIR=.*$,SHELLDIR=\$(PREFIX)/games,' \
6666 -e 's,^CFLAGS=-g,CFLAGS=,' \
pkgs/games/zdoom/bcc-git.nix+1−1
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
1111 };
1212
1313 enableParallelBuilding = true;
14− makeFlags = ["CC=cc"];
14+ makeFlags = ["CC=${stdenv.cc.targetPrefix}cc"];
1515
1616 patches = [ ./bcc-warning-fix.patch ];
1717
pkgs/misc/emulators/simh/default.nix+1−1
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
2222
2323 dontConfigure = true;
2424
25− makeFlags = [ "GCC=cc" "CC_STD=-std=c99" "LDFLAGS=-lm" ];
25+ makeFlags = [ "GCC=${stdenv.cc.targetPrefix}cc" "CC_STD=-std=c99" "LDFLAGS=-lm" ];
2626
2727 preInstall = ''
2828 install -d ${placeholder "out"}/bin
pkgs/os-specific/linux/libvolume_id/default.nix+1−1
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
99 };
1010
1111 preBuild = "
12− makeFlagsArray=(prefix=$out E=echo RANLIB=ranlib INSTALL='install -c')
12+ makeFlagsArray=(prefix=$out E=echo RANLIB=${stdenv.cc.targetPrefix}ranlib INSTALL='install -c')
1313 ";
1414
1515 # Work around a broken Makefile.
pkgs/tools/X11/setroot/default.nix+1−1
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
1818 buildInputs = [ libX11 imlib2 ]
1919 ++ lib.optional enableXinerama libXinerama;
2020
21− buildFlags = [ "CC=cc" (if enableXinerama then "xinerama=1" else "xinerama=0") ] ;
21+ buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" (if enableXinerama then "xinerama=1" else "xinerama=0") ] ;
2222
2323 installFlags = [ "DESTDIR=$(out)" "PREFIX=" ];
2424
pkgs/tools/archivers/unar/default.nix+2−2
@@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
1515 postPatch = ''
1616 for f in Makefile.linux ../UniversalDetector/Makefile.linux ; do
1717 substituteInPlace $f \
18− --replace "= gcc" "=cc" \
19− --replace "= g++" "=c++" \
18+ --replace "= gcc" "=${stdenv.cc.targetPrefix}cc" \
19+ --replace "= g++" "=${stdenv.cc.targetPrefix}c++" \
2020 --replace "-DGNU_RUNTIME=1" "" \
2121 --replace "-fgnu-runtime" "-fobjc-nonfragile-abi"
2222 done
pkgs/tools/cd-dvd/bchunk/default.nix+1−1
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "12dxx98kbpc5z4dgni25280088bhlsb677rp832r82zzc1drpng7";
1010 };
1111
12− makeFlags = lib.optionals stdenv.cc.isClang [ "CC=cc" "LD=cc" ];
12+ makeFlags = lib.optionals stdenv.cc.isClang [ "CC=${stdenv.cc.targetPrefix}cc" "LD=${stdenv.cc.targetPrefix}cc" ];
1313
1414 installPhase = ''
1515 install -Dt $out/bin bchunk
pkgs/tools/cd-dvd/cue2pops/default.nix+1−1
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
1616
1717 dontConfigure = true;
1818
19− makeFlags = [ "CC=cc" ];
19+ makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
2020
2121 installPhase = ''
2222 install --directory --mode=755 $out/bin
pkgs/tools/compression/hactool/default.nix+1−1
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
1515 mv config.mk.template config.mk
1616 '';
1717
18− makeFlags = lib.optionals stdenv.isDarwin [ "CC=cc" ];
18+ makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
1919
2020 installPhase = ''
2121 install -D hactool $out/bin/hactool
pkgs/tools/graphics/pngcrush/default.nix+1−1
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
88 sha256 = "0l43c59d6v9l0g07z3q3ywhb8xb3vz74llv3mna0izk9bj6aqkiv";
99 };
1010
11− makeFlags = [ "CC=cc" "LD=cc" ]; # gcc and/or clang compat
11+ makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "LD=${stdenv.cc.targetPrefix}cc" ]; # gcc and/or clang compat
1212
1313 configurePhase = ''
1414 sed -i s,/usr,$out, Makefile
pkgs/tools/misc/convbin/default.nix+1−1
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 sha256 = "0n502zj8igm583kbfvyv7zhd97vb71jac41ncb9jr2yz2v5ir8j9";
1414 };
1515
16− makeFlags = [ "CC=cc" ];
16+ makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
1717
1818 checkPhase = ''
1919 pushd test
pkgs/tools/misc/convfont/default.nix+1−1
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 sha256 = "1lj24yq5gj9hxhy1srk73521q95zyqzkws0q4v271hf5wmqaxa2f";
1414 };
1515
16− makeFlags = [ "CC=cc" ];
16+ makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
1717
1818 installPhase = ''
1919 install -Dm755 convfont $out/bin/convfont
pkgs/tools/misc/convimg/default.nix+1−1
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 fetchSubmodules = true;
1515 };
1616
17− makeFlags = [ "CC=cc" ];
17+ makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
1818
1919 checkPhase = ''
2020 pushd test
pkgs/tools/misc/moreutils/default.nix+1−1
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
2020
2121 propagatedBuildInputs = with perlPackages; [ perl IPCRun TimeDate TimeDuration ];
2222
23− buildFlags = [ "CC=cc" ];
23+ buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
2424 installFlags = [ "PREFIX=$(out)" ];
2525
2626 postInstall = ''
pkgs/tools/misc/tldr/default.nix+1−1
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 buildInputs = [ curl libzip ];
1515 nativeBuildInputs = [ pkg-config ];
1616
17− makeFlags = ["CC=cc" "LD=cc" "CFLAGS="];
17+ makeFlags = ["CC=${stdenv.cc.targetPrefix}cc" "LD=${stdenv.cc.targetPrefix}cc" "CFLAGS="];
1818
1919 installFlags = [ "PREFIX=$(out)" ];
2020
pkgs/tools/misc/unclutter/default.nix+1−1
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
99
1010 buildInputs = [xlibsWrapper];
1111
12− buildFlags = [ "CC=cc" ];
12+ buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
1313
1414 installPhase = ''
1515 mkdir -pv "$out/bin"
pkgs/tools/networking/connect/default.nix+1−1
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "00yld6yinc8s4xv3b8kbvzn2f4rja5dmp6ysv3n4847qn4k60dh7";
1010 };
1111
12− makeFlags = [ "CC=cc" ]; # gcc and/or clang compat
12+ makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; # gcc and/or clang compat
1313
1414 installPhase = ''
1515 install -D -m ugo=rx connect $out/bin/connect
pkgs/tools/networking/flvstreamer/default.nix+1−1
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 };
1111
1212 buildPhase = ''
13− make CC=cc posix
13+ make CC=${stdenv.cc.targetPrefix}cc posix
1414 '';
1515
1616 installPhase = ''
pkgs/tools/networking/haproxy/default.nix+1−1
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
4747 "USE_GETADDRINFO=1"
4848 ] ++ lib.optionals withPrometheusExporter [
4949 "EXTRA_OBJS=contrib/prometheus-exporter/service-prometheus.o"
50− ] ++ lib.optional stdenv.isDarwin "CC=cc";
50+ ] ++ [ "CC=${stdenv.cc.targetPrefix}cc" ];
5151
5252 enableParallelBuilding = true;
5353
pkgs/tools/security/apg/default.nix+1−1
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
88 configurePhase = ''
99 substituteInPlace Makefile --replace /usr/local "$out"
1010 '';
11− makeFlags = lib.optionals stdenv.isDarwin ["CC=cc"];
11+ makeFlags = ["CC=${stdenv.cc.targetPrefix}cc"];
1212
1313 patches = [
1414 ./apg.patch
pkgs/tools/security/masscan/default.nix+1−1
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919
2020 nativeBuildInputs = [ makeWrapper installShellFiles ];
2121
22− makeFlags = [ "PREFIX=$(out)" "GITVER=${version}" "CC=cc" ];
22+ makeFlags = [ "PREFIX=$(out)" "GITVER=${version}" "CC=${stdenv.cc.targetPrefix}cc" ];
2323
2424 preInstall = ''
2525 mkdir -p $out/bin
pkgs/tools/security/sslscan/default.nix+1−1
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313
1414 buildInputs = [ openssl ];
1515
16− makeFlags = [ "PREFIX=$(out)" "CC=cc" ];
16+ makeFlags = [ "PREFIX=$(out)" "CC=${stdenv.cc.targetPrefix}cc" ];
1717
1818 meta = with lib; {
1919 description = "Tests SSL/TLS services and discover supported cipher suites";
pkgs/tools/security/stricat/default.nix+1−1
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "1axg8r4g5n5kdqj5013pgck80nni3z172xkg506vz4zx1zcmrm4r";
1010 };
1111
12− buildFlags = [ "CC=cc" ];
12+ buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
1313
1414 installPhase = ''
1515 mkdir -p $out/bin
pkgs/tools/text/boxes/default.nix+1−1
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
2525 "GLOBALCONF=${placeholder "out"}/share/boxes/boxes-config"
2626 '';
2727
28− makeFlags = lib.optionals stdenv.isDarwin [ "CC=cc" ];
28+ makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
2929
3030 installPhase = ''
3131 install -Dm755 -t $out/bin src/boxes
pkgs/tools/video/yamdi/default.nix+1−1
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
1414 sha256 = "4a6630f27f6c22bcd95982bf3357747d19f40bd98297a569e9c77468b756f715";
1515 };
1616
17− buildFlags = [ "CC=cc" ];
17+ buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
1818
1919 installPhase = ''
2020 install -D {,$out/bin/}yamdi