diff options
| author | Ben Siraphob <bensiraphob@gmail.com> | 2021-02-16 18:48:46 +0700 |
|---|---|---|
| committer | Ben Siraphob <bensiraphob@gmail.com> | 2021-02-20 01:01:46 +0700 |
| commit | 223f25cf4a2ca9e2b35801eb0c43540151df89b9 (patch) | |
| tree | a43b8bfb6b924ef794f2cba0867df97f2ce1b70c /pkgs/games | |
| parent | ad4db3f4d8ae54482c63c31c14921cb73953548d (diff) | |
treewide: add targetPrefix to hardcoded references to CC=cc
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/assaultcube/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/games/crawl/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/games/nethack/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/games/zdoom/bcc-git.nix | 2 |
4 files changed, 4 insertions, 4 deletions
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 ]; |