From 223f25cf4a2ca9e2b35801eb0c43540151df89b9 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Tue, 16 Feb 2021 18:48:46 +0700 Subject: treewide: add targetPrefix to hardcoded references to CC=cc --- pkgs/applications/editors/jed/default.nix | 2 +- pkgs/applications/editors/viw/default.nix | 2 +- pkgs/applications/misc/gpscorrelate/default.nix | 4 ++-- pkgs/applications/misc/tty-solitaire/default.nix | 2 +- .../instant-messengers/pidgin-plugins/purple-matrix/default.nix | 2 +- pkgs/applications/science/biology/bcftools/default.nix | 2 +- pkgs/applications/science/biology/prodigal/default.nix | 2 +- pkgs/applications/science/math/gfan/default.nix | 2 +- pkgs/applications/science/math/msieve/default.nix | 2 +- pkgs/applications/science/math/ratpoints/default.nix | 2 +- pkgs/applications/video/kodi/default.nix | 4 ++-- pkgs/applications/window-managers/windowmaker/dockapps/wmsm-app.nix | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) (limited to 'pkgs/applications') 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 -- cgit 1.4.1