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

Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'

Browse Source 
Partial staging merge, including cc-wrapper fixes

Conflicts:
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
This commit is contained in:
Shea Levy
2015-02-02 21:14:28 -05:00
parent acbf8eb561 cfb29ab882
commit c45372f038
153 changed files with 419 additions and 377 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/misc/drivers/gutenprint/bin.nix
+1 -1
View File
@@ -38,7 +38,7 @@ stdenv.mkDerivation {
phases = "buildPhase";
libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.gcc zlib ];
libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc zlib ];
buildPhase = ''
ar -x $src data.tar.gz
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.35";
@@ -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;