public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc

Browse Source
This commit is contained in:
Eric Seidel
2015-01-14 20:27:55 -08:00
parent 16fe4be790
commit f3c6827373
89 changed files with 137 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/games/ultrastardx/default.nix
+1 -1
View File
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
# The fpc is not properly wrapped to add -rpath. I add this manually.
# I even do a trick on lib/lib64 for libgcc, that I expect it will work.
preBuild = ''
export NIX_LDFLAGS="$NIX_LDFLAGS -rpath ${SDL}/lib -rpath ${SDL_image}/lib -rpath ${libpng}/lib -rpath ${freetype}/lib -rpath ${portaudio}/lib -rpath ${ffmpeg}/lib -rpath ${zlib}/lib -rpath ${sqlite}/lib -rpath ${libX11}/lib -rpath ${pcre}/lib -rpath ${lua}/lib -rpath ${stdenv.cc.gcc}/lib64 -rpath ${stdenv.cc.gcc}/lib"
export NIX_LDFLAGS="$NIX_LDFLAGS -rpath ${SDL}/lib -rpath ${SDL_image}/lib -rpath ${libpng}/lib -rpath ${freetype}/lib -rpath ${portaudio}/lib -rpath ${ffmpeg}/lib -rpath ${zlib}/lib -rpath ${sqlite}/lib -rpath ${libX11}/lib -rpath ${pcre}/lib -rpath ${lua}/lib -rpath ${stdenv.cc.cc}/lib64 -rpath ${stdenv.cc.cc}/lib"
sed -i 414,424d Makefile
'';