diff options
| author | Shea Levy <shea@shealevy.com> | 2015-02-02 21:14:28 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2015-02-02 21:14:28 -0500 |
| commit | c45372f038bc89c69390bdbc6a4b0bfdb63b1423 (patch) | |
| tree | dc8ebe44d7a1ad0dc01b938199db38ebc14fbdfb /pkgs/tools/graphics | |
| parent | acbf8eb5617bb601e81cdc783f941773032cf400 (diff) | |
| parent | cfb29ab882323d379aba20a95020c7c24f883eae (diff) | |
| download | nixlib-c45372f038bc89c69390bdbc6a4b0bfdb63b1423.tar nixlib-c45372f038bc89c69390bdbc6a4b0bfdb63b1423.tar.gz nixlib-c45372f038bc89c69390bdbc6a4b0bfdb63b1423.tar.bz2 nixlib-c45372f038bc89c69390bdbc6a4b0bfdb63b1423.tar.lz nixlib-c45372f038bc89c69390bdbc6a4b0bfdb63b1423.tar.xz nixlib-c45372f038bc89c69390bdbc6a4b0bfdb63b1423.tar.zst nixlib-c45372f038bc89c69390bdbc6a4b0bfdb63b1423.zip | |
Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'
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
Diffstat (limited to 'pkgs/tools/graphics')
| -rw-r--r-- | pkgs/tools/graphics/cuneiform/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix index 38d5df22fd7a..c5d9475850e3 100644 --- a/pkgs/tools/graphics/cuneiform/default.nix +++ b/pkgs/tools/graphics/cuneiform/default.nix @@ -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; |