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

Fix 64-bit cuneiform build

Browse Source 
svn path=/nixpkgs/trunk/; revision=27402
This commit is contained in:
Michael Raskin 2011-06-09 08:23:58 +00:00
parent d27a2ef6cf
commit 51fa598ba1
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/graphics/cuneiform/default.nix
View File

@ -28,8 +28,10 @@ rec {
cmake .. -DCMAKE_BUILD_TYPE=debug -DCMAKE_INSTALL_PREFIX=$out -DDL_LIB=${libc}/lib
'') ["minInit" "addInputs" "doUnpack" "defEnsureDir"];
needLib64 = a.stdenv.system == "x86_64-linux";
postInstall = a.fullDepEntry(''
patchelf --set-rpath $out/lib${if a.stdenv.gcc.gcc != null then ":${a.stdenv.gcc.gcc}/lib" else ""}:${a.imagemagick}/lib $out/bin/cuneiform
patchelf --set-rpath $out/lib${if needLib64 then "64" else ""}${if a.stdenv.gcc.gcc != null then ":${a.stdenv.gcc.gcc}/lib" else ""}${if a.stdenv.gcc.gcc != null && needLib64 then ":${a.stdenv.gcc.gcc}/lib64" else ""}:${a.imagemagick}/lib $out/bin/cuneiform
'') ["minInit" "addInputs" "doMakeInstall"];
name = "cuneiform-" + version;