diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2014-12-31 13:01:36 +0100 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2014-12-31 13:01:36 +0100 |
| commit | 987d7bcad86901f304ca932e54fe4104ad40dfc6 (patch) | |
| tree | 907d114840c512a9ac3ac7406feb7974b40d698e | |
| parent | 488611aea412a7392a6b58ba608904e148423840 (diff) | |
Change CC references from $NIX_GCC to $NIX_CC.
The variable name has changed to a more generic NIX_CC in NixOS/nixpkgs@05edd656f6bdecde31eb0270209cfc7e2320caad. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| -rw-r--r-- | cavestoryplus.nix | 2 | ||||
| -rw-r--r-- | fez.nix | 2 | ||||
| -rw-r--r-- | ftl.nix | 2 | ||||
| -rw-r--r-- | jamestown.nix | 2 | ||||
| -rw-r--r-- | swordsandsoldiers.nix | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/cavestoryplus.nix b/cavestoryplus.nix index 474c8a12..6f343c0c 100644 --- a/cavestoryplus.nix +++ b/cavestoryplus.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; in '' patchelf \ - --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${rpath}" CaveStory+_64 ''; diff --git a/fez.nix b/fez.nix index 59cda41d..5f23b97c 100644 --- a/fez.nix +++ b/fez.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { buildPhase = '' patchelf \ - --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${stdenv.lib.makeLibraryPath [ mono openal SDL2 ]}" \ FEZ.bin.x86_64 ''; diff --git a/ftl.nix b/ftl.nix index a6fc84b2..17d484dc 100644 --- a/ftl.nix +++ b/ftl.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; in '' patchelf \ - --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${rpath}" data/amd64/bin/FTL ''; diff --git a/jamestown.nix b/jamestown.nix index 4836b302..15900bba 100644 --- a/jamestown.nix +++ b/jamestown.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { mkdir -p "$out/share" mv Archives "$out/share/jamestown" - makeWrapper "$(cat "$NIX_GCC/nix-support/dynamic-linker")" \ + makeWrapper "$(cat "$NIX_CC/nix-support/dynamic-linker")" \ "$out/bin/jamestown" \ --add-flags "$libexec/jamestown" \ --set LD_LIBRARY_PATH "${rpath}" diff --git a/swordsandsoldiers.nix b/swordsandsoldiers.nix index f99b0db1..8c5b0eec 100644 --- a/swordsandsoldiers.nix +++ b/swordsandsoldiers.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { in '' for i in SwordsAndSoldiers.bin SwordsAndSoldiersSetup.bin; do patchelf \ - --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${rpath}" "$i" done ''; |