diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2011-06-09 08:23:58 +0000 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2011-06-09 08:23:58 +0000 |
| commit | 51fa598ba195ba521b14168a856bb6176616f5d4 (patch) | |
| tree | 471928e39de14b169743b954d6972656b2afc977 /pkgs/tools/graphics/cuneiform | |
| parent | d27a2ef6cf2742b36b314cf6fb6bbe8138fff981 (diff) | |
| download | nixlib-51fa598ba195ba521b14168a856bb6176616f5d4.tar nixlib-51fa598ba195ba521b14168a856bb6176616f5d4.tar.gz nixlib-51fa598ba195ba521b14168a856bb6176616f5d4.tar.bz2 nixlib-51fa598ba195ba521b14168a856bb6176616f5d4.tar.lz nixlib-51fa598ba195ba521b14168a856bb6176616f5d4.tar.xz nixlib-51fa598ba195ba521b14168a856bb6176616f5d4.tar.zst nixlib-51fa598ba195ba521b14168a856bb6176616f5d4.zip | |
Fix 64-bit cuneiform build
svn path=/nixpkgs/trunk/; revision=27402
Diffstat (limited to 'pkgs/tools/graphics/cuneiform')
| -rw-r--r-- | pkgs/tools/graphics/cuneiform/default.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix index 0e5131b603d0..232b6c5464a9 100644 --- a/pkgs/tools/graphics/cuneiform/default.nix +++ b/pkgs/tools/graphics/cuneiform/default.nix @@ -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; |