Author: raskin Date: Thu Jun 9 08:23:58 2011 New Revision: 27402 URL: https://svn.nixos.org/websvn/nix/?rev=27402&sc=1
Log: Fix 64-bit cuneiform build Modified: nixpkgs/trunk/pkgs/tools/graphics/cuneiform/default.nix Modified: nixpkgs/trunk/pkgs/tools/graphics/cuneiform/default.nix ============================================================================== --- nixpkgs/trunk/pkgs/tools/graphics/cuneiform/default.nix Thu Jun 9 07:48:54 2011 (r27401) +++ nixpkgs/trunk/pkgs/tools/graphics/cuneiform/default.nix Thu Jun 9 08:23:58 2011 (r27402) @@ -28,8 +28,10 @@ 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; _______________________________________________ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits