diff options
53 files changed, 56 insertions, 56 deletions
diff --git a/pkgs/applications/editors/jed/default.nix b/pkgs/applications/editors/jed/default.nix index 7b197be0e6fa6..29c8bc258ccbd 100644 --- a/pkgs/applications/editors/jed/default.nix +++ b/pkgs/applications/editors/jed/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ]; configureFlags = [ - "CC=cc" + "CC=${stdenv.cc.targetPrefix}cc" "--with-slang=${slang}" "JED_ROOT=${placeholder "out"}/share/jed" ]; diff --git a/pkgs/applications/editors/viw/default.nix b/pkgs/applications/editors/viw/default.nix index 3aad18ef11cbc..0ba381901b983 100644 --- a/pkgs/applications/editors/viw/default.nix +++ b/pkgs/applications/editors/viw/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ]; - makeFlags = [ "CC=cc" ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; checkFlags = [ "test-command" "test-buffer" "test-state" ]; installPhase = '' diff --git a/pkgs/applications/misc/gpscorrelate/default.nix b/pkgs/applications/misc/gpscorrelate/default.nix index a1357ff0a0844..00a3914e17350 100644 --- a/pkgs/applications/misc/gpscorrelate/default.nix +++ b/pkgs/applications/misc/gpscorrelate/default.nix @@ -29,8 +29,8 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=${placeholder "out"}" - "CC=cc" - "CXX=c++" + "CC=${stdenv.cc.targetPrefix}cc" + "CXX=${stdenv.cc.targetPrefix}c++" "CFLAGS=-DENABLE_NLS" ]; diff --git a/pkgs/applications/misc/tty-solitaire/default.nix b/pkgs/applications/misc/tty-solitaire/default.nix index 9b2fcf3d17a1e..9ea26b52bc34e 100644 --- a/pkgs/applications/misc/tty-solitaire/default.nix +++ b/pkgs/applications/misc/tty-solitaire/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { patchPhase = "sed -i -e '/^CFLAGS *?= *-g *$/d' Makefile"; - makeFlags = [ "CC=cc" "PREFIX=${placeholder "out"}" ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "PREFIX=${placeholder "out"}" ]; meta = with lib; { description = "Klondike Solitaire in your ncurses terminal"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix index 2862e4df796a2..9845491f235de 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { "DATA_ROOT_DIR_PURPLE=${placeholder "out"}/share" ]; - buildFlags = [ "CC=cc" ]; # fix build on darwin + buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; # fix build on darwin meta = with lib; { homepage = "https://github.com/matrix-org/purple-matrix"; diff --git a/pkgs/applications/science/biology/bcftools/default.nix b/pkgs/applications/science/biology/bcftools/default.nix index f4e2db01fbc56..e15cac60295e8 100644 --- a/pkgs/applications/science/biology/bcftools/default.nix +++ b/pkgs/applications/science/biology/bcftools/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { makeFlags = [ "HSTDIR=${htslib}" "prefix=$(out)" - "CC=cc" + "CC=${stdenv.cc.targetPrefix}cc" ]; preCheck = '' diff --git a/pkgs/applications/science/biology/prodigal/default.nix b/pkgs/applications/science/biology/prodigal/default.nix index 22883cc522f1a..28a21522c6b81 100644 --- a/pkgs/applications/science/biology/prodigal/default.nix +++ b/pkgs/applications/science/biology/prodigal/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; makeFlags = [ - "CC=cc" + "CC=${stdenv.cc.targetPrefix}cc" "INSTALLDIR=$(out)/bin" ]; diff --git a/pkgs/applications/science/math/gfan/default.nix b/pkgs/applications/science/math/gfan/default.nix index 587568f8c297f..1a2835932c663 100644 --- a/pkgs/applications/science/math/gfan/default.nix +++ b/pkgs/applications/science/math/gfan/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace "-fno-guess-branch-probability" "" ''; - buildFlags = [ "CC=cc" "CXX=c++" ]; + buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "CXX=${stdenv.cc.targetPrefix}c++" ]; installFlags = [ "PREFIX=$(out)" ]; buildInputs = [ gmp mpir cddlib ]; diff --git a/pkgs/applications/science/math/msieve/default.nix b/pkgs/applications/science/math/msieve/default.nix index 679b29cb062bc..588df51554ab9 100644 --- a/pkgs/applications/science/math/msieve/default.nix +++ b/pkgs/applications/science/math/msieve/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { ECM = if ecm == null then "0" else "1"; # Doesn't hurt Linux but lets clang-based platforms like Darwin work fine too - makeFlags = [ "CC=cc" "all" ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "all" ]; installPhase = '' mkdir -p $out/bin/ diff --git a/pkgs/applications/science/math/ratpoints/default.nix b/pkgs/applications/science/math/ratpoints/default.nix index eed1c8e3fd48f..14330b0f19b3e 100644 --- a/pkgs/applications/science/math/ratpoints/default.nix +++ b/pkgs/applications/science/math/ratpoints/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ gmp ]; - makeFlags = [ "CC=cc" ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; buildFlags = lib.optional stdenv.isDarwin ["CCFLAGS2=-lgmp -lc -lm" "CCFLAGS=-UUSE_SSE"]; installFlags = [ "INSTALL_DIR=$(out)" ]; diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index 3aaa465a3ccb8..f060a7b2e5a64 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -248,10 +248,10 @@ in stdenv.mkDerivation { # Need these tools on the build system when cross compiling, # hacky, but have found no other way. preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' - CXX=c++ LD=ld make -C tools/depends/native/JsonSchemaBuilder + CXX=${stdenv.cc.targetPrefix}c++ LD=ld make -C tools/depends/native/JsonSchemaBuilder cmakeFlags+=" -DWITH_JSONSCHEMABUILDER=$PWD/tools/depends/native/JsonSchemaBuilder/bin" - CXX=c++ LD=ld make EXTRA_CONFIGURE= -C tools/depends/native/TexturePacker + CXX=${stdenv.cc.targetPrefix}c++ LD=ld make EXTRA_CONFIGURE= -C tools/depends/native/TexturePacker cmakeFlags+=" -DWITH_TEXTUREPACKER=$PWD/tools/depends/native/TexturePacker/bin" ''; diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmsm-app.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmsm-app.nix index e427a85d0386c..c201c55dcea54 100644 --- a/pkgs/applications/window-managers/windowmaker/dockapps/wmsm-app.nix +++ b/pkgs/applications/window-managers/windowmaker/dockapps/wmsm-app.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { --replace "/usr/bin/install" "install" ''; - makeFlags = [ "CC=cc" ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; preInstall = '' runHook preInstall diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index 98a6b9877d15f..82dd336e5e506 100644 --- a/pkgs/data/misc/tzdata/default.nix +++ b/pkgs/data/misc/tzdata/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { preInstall = '' mv zic.o zic.o.orig mv zic zic.orig - make $makeFlags cc=cc AR=ar zic + make $makeFlags cc=${stdenv.cc.targetPrefix}cc AR=${stdenv.cc.targetPrefix}ar zic mv zic zic-native mv zic.o.orig zic.o mv zic.orig zic diff --git a/pkgs/development/compilers/mosml/default.nix b/pkgs/development/compilers/mosml/default.nix index ec8fa793cfd48..54b55aadd794e 100644 --- a/pkgs/development/compilers/mosml/default.nix +++ b/pkgs/development/compilers/mosml/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { buildInputs = [ gmp perl ]; - makeFlags = [ "PREFIX=$(out)" ] ++ lib.optionals stdenv.isDarwin [ "CC=cc" ]; + makeFlags = [ "PREFIX=$(out)" ] ++ lib.optionals stdenv.isDarwin [ "CC=${stdenv.cc.targetPrefix}cc" ]; src = fetchurl { url = "https://github.com/kfl/mosml/archive/ver-${version}.tar.gz"; diff --git a/pkgs/development/compilers/owl-lisp/default.nix b/pkgs/development/compilers/owl-lisp/default.nix index d8d141a5e5671..2471910fdb5b0 100644 --- a/pkgs/development/compilers/owl-lisp/default.nix +++ b/pkgs/development/compilers/owl-lisp/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ which ]; - makeFlags = [ "PREFIX=${placeholder "out"}" "CC=cc" ]; + makeFlags = [ "PREFIX=${placeholder "out"}" "CC=${stdenv.cc.targetPrefix}cc" ]; # tests are run as part of the compilation process doCheck = false; diff --git a/pkgs/development/libraries/java/junixsocket/default.nix b/pkgs/development/libraries/java/junixsocket/default.nix index 7a7d6a933bc06..0484f4c59ba6f 100644 --- a/pkgs/development/libraries/java/junixsocket/default.nix +++ b/pkgs/development/libraries/java/junixsocket/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ANT_ARGS = # Note that our OpenJDK on Darwin is currently 32-bit, so we have to build a 32-bit dylib. (if stdenv.is64bit then [ "-Dskip32=true" ] else [ "-Dskip64=true" ]) - ++ [ "-Dgcc=cc" "-Dant.build.javac.source=1.6" ] + ++ [ "-Dgcc=${stdenv.cc.targetPrefix}cc" "-Dant.build.javac.source=1.6" ] ++ lib.optional stdenv.isDarwin "-DisMac=true"; installPhase = diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index ad95edb68cb29..a3de9225d1cef 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -61,7 +61,7 @@ let "--enable-avplay" "--enable-shared" "--enable-runtime-cpudetect" - "--cc=cc" + "--cc=${stdenv.cc.targetPrefix}cc" (enableFeature enableGPL "gpl") (enableFeature enableGPL "swscale") (enableFeature mp3Support "libmp3lame") diff --git a/pkgs/development/libraries/mysocketw/default.nix b/pkgs/development/libraries/mysocketw/default.nix index 3b5da68a59d76..52d294525a0c4 100644 --- a/pkgs/development/libraries/mysocketw/default.nix +++ b/pkgs/development/libraries/mysocketw/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { --replace -Wl,-soname, -Wl,-install_name,$out/lib/ ''; - makeFlags = [ "PREFIX=$(out)" "CXX=c++" ]; + makeFlags = [ "PREFIX=$(out)" "CXX=${stdenv.cc.targetPrefix}c++" ]; meta = { description = "Cross platform (Linux/FreeBSD/Unix/Win32) streaming socket C++"; diff --git a/pkgs/development/libraries/ntl/default.nix b/pkgs/development/libraries/ntl/default.nix index 23d82d4ba2fa9..ee3cf93bc214b 100644 --- a/pkgs/development/libraries/ntl/default.nix +++ b/pkgs/development/libraries/ntl/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { else "generic" # "chooses options that should be OK for most platforms" }" - "CXX=c++" + "CXX=${stdenv.cc.targetPrefix}c++" ] ++ lib.optionals withGf2x [ "NTL_GF2X_LIB=on" "GF2X_PREFIX=${gf2x}" diff --git a/pkgs/development/libraries/odpic/default.nix b/pkgs/development/libraries/odpic/default.nix index b79de9278d465..251a3f9f55b8c 100644 --- a/pkgs/development/libraries/odpic/default.nix +++ b/pkgs/development/libraries/odpic/default.nix @@ -22,7 +22,7 @@ in stdenv.mkDerivation { ++ lib.optionals stdenv.isLinux [ libaio ]; dontPatchELF = true; - makeFlags = [ "PREFIX=$(out)" "CC=cc" "LD=cc"]; + makeFlags = [ "PREFIX=$(out)" "CC=${stdenv.cc.targetPrefix}cc" "LD=${stdenv.cc.targetPrefix}cc"]; postFixup = '' ${lib.optionalString (stdenv.isLinux) '' diff --git a/pkgs/development/libraries/science/math/zn_poly/default.nix b/pkgs/development/libraries/science/math/zn_poly/default.nix index 0d1a331798cfc..8f3e1aba350e9 100644 --- a/pkgs/development/libraries/science/math/zn_poly/default.nix +++ b/pkgs/development/libraries/science/math/zn_poly/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { libbasename = "libzn_poly"; libext = stdenv.targetPlatform.extensions.sharedLibrary; - makeFlags = [ "CC=cc" ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; # Tuning (either autotuning or with hand-written paramters) is possible # but not implemented here. diff --git a/pkgs/development/libraries/sonic/default.nix b/pkgs/development/libraries/sonic/default.nix index 38dcee84a928f..ba3164db11aac 100644 --- a/pkgs/development/libraries/sonic/default.nix +++ b/pkgs/development/libraries/sonic/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "0ah54nizb6iwcx277w104wsfnx05vrp4sh56d2pfxhf8xghg54m6"; }; - makeFlags = [ "PREFIX=${placeholder "out"}" "CC=cc" ]; + makeFlags = [ "PREFIX=${placeholder "out"}" "CC=${stdenv.cc.targetPrefix}cc" ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/misc/elfkickers/default.nix b/pkgs/development/tools/misc/elfkickers/default.nix index e60b40c7fd4c1..775ad6937dc49 100644 --- a/pkgs/development/tools/misc/elfkickers/default.nix +++ b/pkgs/development/tools/misc/elfkickers/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "02354yn1lh1dxny35ky2d0b44iq302krsqpwk5grr4glma00hhq6"; }; - makeFlags = [ "CC=cc prefix=$(out)" ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc prefix=$(out)" ]; enableParallelBuilding = true; diff --git a/pkgs/development/tools/misc/micronucleus/default.nix b/pkgs/development/tools/misc/micronucleus/default.nix index 2d4dba61b8726..d3bca0b684c7b 100644 --- a/pkgs/development/tools/misc/micronucleus/default.nix +++ b/pkgs/development/tools/misc/micronucleus/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libusb-compat-0_1 ]; - makeFlags = lib.optionals stdenv.isDarwin [ "CC=cc" ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/development/tools/misc/sloccount/default.nix b/pkgs/development/tools/misc/sloccount/default.nix index fc041f2ee8d6a..2fd9849028752 100644 --- a/pkgs/development/tools/misc/sloccount/default.nix +++ b/pkgs/development/tools/misc/sloccount/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { done ''; - makeFlags = [ "PREFIX=$(out)" "CC=cc" ]; + makeFlags = [ "PREFIX=$(out)" "CC=${stdenv.cc.targetPrefix}cc" ]; doCheck = true; checkPhase = ''HOME="$TMPDIR" PATH="$PWD:$PATH" make test''; diff --git a/pkgs/development/tools/misc/stm32flash/default.nix b/pkgs/development/tools/misc/stm32flash/default.nix index bc7d4b1b3dc80..8b9646713e886 100644 --- a/pkgs/development/tools/misc/stm32flash/default.nix +++ b/pkgs/development/tools/misc/stm32flash/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "01p396daqw3zh6nijffbfbwyqza33bi2k4q3m5yjzs02xwi99alp"; }; - buildFlags = [ "CC=cc" ]; + buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; installPhase = '' # Manually copy, make install copies to /usr/local/bin diff --git a/pkgs/games/assaultcube/default.nix b/pkgs/games/assaultcube/default.nix index 0206821f38738..a2c00ddc149bd 100644 --- a/pkgs/games/assaultcube/default.nix +++ b/pkgs/games/assaultcube/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ file zlib ] ++ optionals client [ openal SDL SDL_image libogg libvorbis ]; targets = (optionalString server "server") + (optionalString client " client"); - makeFlags = [ "-C source/src" "CXX=c++" targets ]; + makeFlags = [ "-C source/src" "CXX=${stdenv.cc.targetPrefix}c++" targets ]; desktop = makeDesktopItem { name = "AssaultCube"; diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix index 7b644aa71476f..042ad950eee46 100644 --- a/pkgs/games/crawl/default.nix +++ b/pkgs/games/crawl/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { fontsPath = lib.optionalString tileMode dejavu_fonts; - makeFlags = [ "prefix=${placeholder "out"}" "FORCE_CC=cc" "FORCE_CXX=c++" "HOSTCXX=c++" + makeFlags = [ "prefix=${placeholder "out"}" "FORCE_CC=${stdenv.cc.targetPrefix}cc" "FORCE_CXX=${stdenv.cc.targetPrefix}c++" "HOSTCXX=${stdenv.cc.targetPrefix}c++" "FORCE_PKGCONFIG=y" "SAVEDIR=~/.crawl" "sqlite=${sqlite.dev}" "DATADIR=${placeholder "out"}" diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix index d6ba771de7ed1..f9939f063c809 100644 --- a/pkgs/games/nethack/default.nix +++ b/pkgs/games/nethack/default.nix @@ -60,7 +60,7 @@ in stdenv.mkDerivation rec { -e 's,^WINTTYLIB=.*,WINTTYLIB=-lncurses,' \ -i sys/unix/hints/linux sed \ - -e 's,^CC=.*$,CC=cc,' \ + -e 's,^CC=.*$,CC=${stdenv.cc.targetPrefix}cc,' \ -e 's,^HACKDIR=.*$,HACKDIR=\$(PREFIX)/games/lib/\$(GAME)dir,' \ -e 's,^SHELLDIR=.*$,SHELLDIR=\$(PREFIX)/games,' \ -e 's,^CFLAGS=-g,CFLAGS=,' \ diff --git a/pkgs/games/zdoom/bcc-git.nix b/pkgs/games/zdoom/bcc-git.nix index 8716a82fc1053..2e9f1a9c2b91c 100644 --- a/pkgs/games/zdoom/bcc-git.nix +++ b/pkgs/games/zdoom/bcc-git.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { }; enableParallelBuilding = true; - makeFlags = ["CC=cc"]; + makeFlags = ["CC=${stdenv.cc.targetPrefix}cc"]; patches = [ ./bcc-warning-fix.patch ]; diff --git a/pkgs/misc/emulators/simh/default.nix b/pkgs/misc/emulators/simh/default.nix index 08068debeefcb..1e939538cda34 100644 --- a/pkgs/misc/emulators/simh/default.nix +++ b/pkgs/misc/emulators/simh/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { dontConfigure = true; - makeFlags = [ "GCC=cc" "CC_STD=-std=c99" "LDFLAGS=-lm" ]; + makeFlags = [ "GCC=${stdenv.cc.targetPrefix}cc" "CC_STD=-std=c99" "LDFLAGS=-lm" ]; preInstall = '' install -d ${placeholder "out"}/bin diff --git a/pkgs/os-specific/linux/libvolume_id/default.nix b/pkgs/os-specific/linux/libvolume_id/default.nix index f6b760668636c..87b7d33c5d84c 100644 --- a/pkgs/os-specific/linux/libvolume_id/default.nix +++ b/pkgs/os-specific/linux/libvolume_id/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; preBuild = " - makeFlagsArray=(prefix=$out E=echo RANLIB=ranlib INSTALL='install -c') + makeFlagsArray=(prefix=$out E=echo RANLIB=${stdenv.cc.targetPrefix}ranlib INSTALL='install -c') "; # Work around a broken Makefile. diff --git a/pkgs/tools/X11/setroot/default.nix b/pkgs/tools/X11/setroot/default.nix index e5a461b0e0e6b..014ac4c54be78 100644 --- a/pkgs/tools/X11/setroot/default.nix +++ b/pkgs/tools/X11/setroot/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 imlib2 ] ++ lib.optional enableXinerama libXinerama; - buildFlags = [ "CC=cc" (if enableXinerama then "xinerama=1" else "xinerama=0") ] ; + buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" (if enableXinerama then "xinerama=1" else "xinerama=0") ] ; installFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; diff --git a/pkgs/tools/archivers/unar/default.nix b/pkgs/tools/archivers/unar/default.nix index d0d0ef90e68dd..4021bc92e0627 100644 --- a/pkgs/tools/archivers/unar/default.nix +++ b/pkgs/tools/archivers/unar/default.nix @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { postPatch = '' for f in Makefile.linux ../UniversalDetector/Makefile.linux ; do substituteInPlace $f \ - --replace "= gcc" "=cc" \ - --replace "= g++" "=c++" \ + --replace "= gcc" "=${stdenv.cc.targetPrefix}cc" \ + --replace "= g++" "=${stdenv.cc.targetPrefix}c++" \ --replace "-DGNU_RUNTIME=1" "" \ --replace "-fgnu-runtime" "-fobjc-nonfragile-abi" done diff --git a/pkgs/tools/cd-dvd/bchunk/default.nix b/pkgs/tools/cd-dvd/bchunk/default.nix index 6affd3ec66204..df8ca279107e8 100644 --- a/pkgs/tools/cd-dvd/bchunk/default.nix +++ b/pkgs/tools/cd-dvd/bchunk/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "12dxx98kbpc5z4dgni25280088bhlsb677rp832r82zzc1drpng7"; }; - makeFlags = lib.optionals stdenv.cc.isClang [ "CC=cc" "LD=cc" ]; + makeFlags = lib.optionals stdenv.cc.isClang [ "CC=${stdenv.cc.targetPrefix}cc" "LD=${stdenv.cc.targetPrefix}cc" ]; installPhase = '' install -Dt $out/bin bchunk diff --git a/pkgs/tools/cd-dvd/cue2pops/default.nix b/pkgs/tools/cd-dvd/cue2pops/default.nix index 70ab6db07c2e0..795589a64ec29 100644 --- a/pkgs/tools/cd-dvd/cue2pops/default.nix +++ b/pkgs/tools/cd-dvd/cue2pops/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { dontConfigure = true; - makeFlags = [ "CC=cc" ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; installPhase = '' install --directory --mode=755 $out/bin diff --git a/pkgs/tools/compression/hactool/default.nix b/pkgs/tools/compression/hactool/default.nix index 85b95a6f76947..f3c80fd7a0db0 100644 --- a/pkgs/tools/compression/hactool/default.nix +++ b/pkgs/tools/compression/hactool/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { mv config.mk.template config.mk ''; - makeFlags = lib.optionals stdenv.isDarwin [ "CC=cc" ]; + makeFlags = lib.optionals stdenv.isDarwin [ "CC=${stdenv.cc.targetPrefix}cc" ]; installPhase = '' install -D hactool $out/bin/hactool diff --git a/pkgs/tools/graphics/pngcrush/default.nix b/pkgs/tools/graphics/pngcrush/default.nix index e4a8b705a1650..18a156ea504bd 100644 --- a/pkgs/tools/graphics/pngcrush/default.nix +++ b/pkgs/tools/graphics/pngcrush/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0l43c59d6v9l0g07z3q3ywhb8xb3vz74llv3mna0izk9bj6aqkiv"; }; - makeFlags = [ "CC=cc" "LD=cc" ]; # gcc and/or clang compat + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "LD=${stdenv.cc.targetPrefix}cc" ]; # gcc and/or clang compat configurePhase = '' sed -i s,/usr,$out, Makefile diff --git a/pkgs/tools/misc/convbin/default.nix b/pkgs/tools/misc/convbin/default.nix index 92890c056b157..7f57cab585bcf 100644 --- a/pkgs/tools/misc/convbin/default.nix +++ b/pkgs/tools/misc/convbin/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0n502zj8igm583kbfvyv7zhd97vb71jac41ncb9jr2yz2v5ir8j9"; }; - makeFlags = [ "CC=cc" ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; checkPhase = '' pushd test diff --git a/pkgs/tools/misc/convfont/default.nix b/pkgs/tools/misc/convfont/default.nix index aeecb05321276..501c4e29a416a 100644 --- a/pkgs/tools/misc/convfont/default.nix +++ b/pkgs/tools/misc/convfont/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1lj24yq5gj9hxhy1srk73521q95zyqzkws0q4v271hf5wmqaxa2f"; }; - makeFlags = [ "CC=cc" ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; installPhase = '' install -Dm755 convfont $out/bin/convfont diff --git a/pkgs/tools/misc/convimg/default.nix b/pkgs/tools/misc/convimg/default.nix index 8caf4cb706f92..0c5ffb4a6dead 100644 --- a/pkgs/tools/misc/convimg/default.nix +++ b/pkgs/tools/misc/convimg/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - makeFlags = [ "CC=cc" ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; checkPhase = '' pushd test diff --git a/pkgs/tools/misc/moreutils/default.nix b/pkgs/tools/misc/moreutils/default.nix index ad2d0127ab058..05149fb7a3f75 100644 --- a/pkgs/tools/misc/moreutils/default.nix +++ b/pkgs/tools/misc/moreutils/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = with perlPackages; [ perl IPCRun TimeDate TimeDuration ]; - buildFlags = [ "CC=cc" ]; + buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; installFlags = [ "PREFIX=$(out)" ]; postInstall = '' diff --git a/pkgs/tools/misc/tldr/default.nix b/pkgs/tools/misc/tldr/default.nix index 25eee1c7b83b0..dfde5a9113bee 100644 --- a/pkgs/tools/misc/tldr/default.nix +++ b/pkgs/tools/misc/tldr/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl libzip ]; nativeBuildInputs = [ pkg-config ]; - makeFlags = ["CC=cc" "LD=cc" "CFLAGS="]; + makeFlags = ["CC=${stdenv.cc.targetPrefix}cc" "LD=${stdenv.cc.targetPrefix}cc" "CFLAGS="]; installFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/tools/misc/unclutter/default.nix b/pkgs/tools/misc/unclutter/default.nix index 1b76029819195..66344c9fdeef7 100644 --- a/pkgs/tools/misc/unclutter/default.nix +++ b/pkgs/tools/misc/unclutter/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { buildInputs = [xlibsWrapper]; - buildFlags = [ "CC=cc" ]; + buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; installPhase = '' mkdir -pv "$out/bin" diff --git a/pkgs/tools/networking/connect/default.nix b/pkgs/tools/networking/connect/default.nix index 1f0831fb890c2..8b8c0018c66ff 100644 --- a/pkgs/tools/networking/connect/default.nix +++ b/pkgs/tools/networking/connect/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "00yld6yinc8s4xv3b8kbvzn2f4rja5dmp6ysv3n4847qn4k60dh7"; }; - makeFlags = [ "CC=cc" ]; # gcc and/or clang compat + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; # gcc and/or clang compat installPhase = '' install -D -m ugo=rx connect $out/bin/connect diff --git a/pkgs/tools/networking/flvstreamer/default.nix b/pkgs/tools/networking/flvstreamer/default.nix index 869cd46b33079..d31751e7d5ca7 100644 --- a/pkgs/tools/networking/flvstreamer/default.nix +++ b/pkgs/tools/networking/flvstreamer/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildPhase = '' - make CC=cc posix + make CC=${stdenv.cc.targetPrefix}cc posix ''; installPhase = '' diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index 6ff8ba096b443..caf78c3d0b384 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { "USE_GETADDRINFO=1" ] ++ lib.optionals withPrometheusExporter [ "EXTRA_OBJS=contrib/prometheus-exporter/service-prometheus.o" - ] ++ lib.optional stdenv.isDarwin "CC=cc"; + ] ++ lib.optional stdenv.isDarwin "CC=${stdenv.cc.targetPrefix}cc"; enableParallelBuilding = true; diff --git a/pkgs/tools/security/apg/default.nix b/pkgs/tools/security/apg/default.nix index 579026f07ca9c..b90c61d1ff674 100644 --- a/pkgs/tools/security/apg/default.nix +++ b/pkgs/tools/security/apg/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { configurePhase = '' substituteInPlace Makefile --replace /usr/local "$out" ''; - makeFlags = lib.optionals stdenv.isDarwin ["CC=cc"]; + makeFlags = lib.optionals stdenv.isDarwin ["CC=${stdenv.cc.targetPrefix}cc"]; patches = [ ./apg.patch diff --git a/pkgs/tools/security/masscan/default.nix b/pkgs/tools/security/masscan/default.nix index b58163630c69d..891311ddaa03a 100644 --- a/pkgs/tools/security/masscan/default.nix +++ b/pkgs/tools/security/masscan/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper installShellFiles ]; - makeFlags = [ "PREFIX=$(out)" "GITVER=${version}" "CC=cc" ]; + makeFlags = [ "PREFIX=$(out)" "GITVER=${version}" "CC=${stdenv.cc.targetPrefix}cc" ]; preInstall = '' mkdir -p $out/bin diff --git a/pkgs/tools/security/sslscan/default.nix b/pkgs/tools/security/sslscan/default.nix index fcf9c4c1ac2fd..b072b3b5574aa 100644 --- a/pkgs/tools/security/sslscan/default.nix +++ b/pkgs/tools/security/sslscan/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl ]; - makeFlags = [ "PREFIX=$(out)" "CC=cc" ]; + makeFlags = [ "PREFIX=$(out)" "CC=${stdenv.cc.targetPrefix}cc" ]; meta = with lib; { description = "Tests SSL/TLS services and discover supported cipher suites"; diff --git a/pkgs/tools/security/stricat/default.nix b/pkgs/tools/security/stricat/default.nix index 460838965a02a..bdd7d18923f17 100644 --- a/pkgs/tools/security/stricat/default.nix +++ b/pkgs/tools/security/stricat/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1axg8r4g5n5kdqj5013pgck80nni3z172xkg506vz4zx1zcmrm4r"; }; - buildFlags = [ "CC=cc" ]; + buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/tools/text/boxes/default.nix b/pkgs/tools/text/boxes/default.nix index 3c58eda650183..892c7976faa6c 100644 --- a/pkgs/tools/text/boxes/default.nix +++ b/pkgs/tools/text/boxes/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { "GLOBALCONF=${placeholder "out"}/share/boxes/boxes-config" ''; - makeFlags = lib.optionals stdenv.isDarwin [ "CC=cc" ]; + makeFlags = lib.optionals stdenv.isDarwin [ "CC=${stdenv.cc.targetPrefix}cc" ]; installPhase = '' install -Dm755 -t $out/bin src/boxes diff --git a/pkgs/tools/video/yamdi/default.nix b/pkgs/tools/video/yamdi/default.nix index 32620fe98c5ab..92737e27ee306 100644 --- a/pkgs/tools/video/yamdi/default.nix +++ b/pkgs/tools/video/yamdi/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "4a6630f27f6c22bcd95982bf3357747d19f40bd98297a569e9c77468b756f715"; }; - buildFlags = [ "CC=cc" ]; + buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; installPhase = '' install -D {,$out/bin/}yamdi |