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/tools/graphics/cuneiform/default.nix
+1 -1
View File
@@ -31,7 +31,7 @@ rec {
needLib64 = a.stdenv.system == "x86_64-linux";
postInstall = a.fullDepEntry(''
patchelf --set-rpath $out/lib${if needLib64 then "64" else ""}${if a.stdenv.cc.gcc != null then ":${a.stdenv.cc.gcc}/lib" else ""}${if a.stdenv.cc.gcc != null && needLib64 then ":${a.stdenv.cc.gcc}/lib64" else ""}:${a.imagemagick}/lib $out/bin/cuneiform
patchelf --set-rpath $out/lib${if needLib64 then "64" else ""}${if a.stdenv.cc.cc != null then ":${a.stdenv.cc.cc}/lib" else ""}${if a.stdenv.cc.cc != null && needLib64 then ":${a.stdenv.cc.cc}/lib64" else ""}:${a.imagemagick}/lib $out/bin/cuneiform
'') ["minInit" "addInputs" "doMakeInstall"];
name = "cuneiform-" + version;