From d903a654d511a2f56326ab4b3de5ae556a3ac7d3 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 16 Apr 2015 20:02:01 +0200 Subject: Rename stdenv.cc.gcc to stdenv.cc.cc. This has been changed in NixOS/nixpkgs@48f63c2. Signed-off-by: aszlig --- humblebundle/cavestoryplus.nix | 2 +- humblebundle/ftl.nix | 2 +- humblebundle/spaz.nix | 2 +- humblebundle/swordsandsoldiers.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/humblebundle/cavestoryplus.nix b/humblebundle/cavestoryplus.nix index 6f343c0c..d4c744d4 100644 --- a/humblebundle/cavestoryplus.nix +++ b/humblebundle/cavestoryplus.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { patchPhase = let rpath = stdenv.lib.makeLibraryPath [ - SDL "$out" stdenv.cc.gcc mesa + SDL "$out" stdenv.cc.cc mesa ]; in '' patchelf \ diff --git a/humblebundle/ftl.nix b/humblebundle/ftl.nix index 17d484dc..7423951a 100644 --- a/humblebundle/ftl.nix +++ b/humblebundle/ftl.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { patchPhase = let rpath = stdenv.lib.makeLibraryPath [ - SDL "$out" stdenv.cc.gcc mesa libdevil freetype + SDL "$out" stdenv.cc.cc mesa libdevil freetype ]; in '' patchelf \ diff --git a/humblebundle/spaz.nix b/humblebundle/spaz.nix index 7ba028d9..5e40ea49 100644 --- a/humblebundle/spaz.nix +++ b/humblebundle/spaz.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildPhase = let libs = pkgsi686Linux.stdenv.lib.makeLibraryPath [ - pkgsi686Linux.stdenv.cc.gcc pkgsi686Linux.SDL + pkgsi686Linux.stdenv.cc.cc pkgsi686Linux.SDL ]; in '' patchelf --set-interpreter "${pkgsi686Linux.glibc}"/lib/ld-linux.so.* \ diff --git a/humblebundle/swordsandsoldiers.nix b/humblebundle/swordsandsoldiers.nix index 8c5b0eec..2fd4fc4b 100644 --- a/humblebundle/swordsandsoldiers.nix +++ b/humblebundle/swordsandsoldiers.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { patchPhase = let rpath = stdenv.lib.makeLibraryPath [ - SDL mesa zlib openal libvorbis fontconfig freetype stdenv.cc.gcc libogg + SDL mesa zlib openal libvorbis fontconfig freetype stdenv.cc.cc libogg xorg.libX11 xorg.libXft xorg.libXinerama xorg.libXext xorg.libXpm ]; in '' -- cgit 1.4.1