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/misc/emulators/wine/stable.nix
+3 -3
View File
@@ -4,7 +4,7 @@
}:
assert stdenv.isLinux;
assert stdenv.cc.gcc != null;
assert stdenv.cc.cc.isGNU or false;
let
version = "1.6.2";
@@ -46,7 +46,7 @@ in stdenv.mkDerivation rec {
# them to the RPATH so that the user doesn't have to set them in
# LD_LIBRARY_PATH.
NIX_LDFLAGS = map (path: "-rpath ${path}/lib ") [
freetype fontconfig stdenv.cc.gcc mesa mesa_noglu.osmesa libdrm
freetype fontconfig stdenv.cc.cc mesa mesa_noglu.osmesa libdrm
xlibs.libXinerama xlibs.libXrender xlibs.libXrandr
xlibs.libXcursor xlibs.libXcomposite libpng libjpeg
openssl gnutls cups
@@ -65,7 +65,7 @@ in stdenv.mkDerivation rec {
paxmark psmr $out/bin/wine{,-preloader}
wrapProgram $out/bin/wine --prefix LD_LIBRARY_PATH : ${stdenv.cc.gcc}/lib
wrapProgram $out/bin/wine --prefix LD_LIBRARY_PATH : ${stdenv.cc.cc}/lib
'';
enableParallelBuilding = true;
pkgs/misc/emulators/wine/unstable.nix
+3 -3
View File
@@ -4,7 +4,7 @@
}:
assert stdenv.isLinux;
assert stdenv.cc.gcc != null;
assert stdenv.cc.cc.isGNU or false;
let
version = "1.7.34";
@@ -46,7 +46,7 @@ in stdenv.mkDerivation rec {
# them to the RPATH so that the user doesn't have to set them in
# LD_LIBRARY_PATH.
NIX_LDFLAGS = map (path: "-rpath ${path}/lib ") [
freetype fontconfig stdenv.cc.gcc mesa mesa_noglu.osmesa libdrm
freetype fontconfig stdenv.cc.cc mesa mesa_noglu.osmesa libdrm
xlibs.libXinerama xlibs.libXrender xlibs.libXrandr
xlibs.libXcursor xlibs.libXcomposite libpng libjpeg
openssl gnutls cups ncurses
@@ -62,7 +62,7 @@ in stdenv.mkDerivation rec {
install -D ${gecko} $out/share/wine/gecko/${gecko64.name}
'' + ''
install -D ${mono} $out/share/wine/mono/${mono.name}
wrapProgram $out/bin/wine --prefix LD_LIBRARY_PATH : ${stdenv.cc.gcc}/lib
wrapProgram $out/bin/wine --prefix LD_LIBRARY_PATH : ${stdenv.cc.cc}/lib
'';
enableParallelBuilding = true;