diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/exiv2/default.nix')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/exiv2/default.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/development/libraries/exiv2/default.nix b/nixpkgs/pkgs/development/libraries/exiv2/default.nix index 21f63e07335d..dc7610ee1782 100644 --- a/nixpkgs/pkgs/development/libraries/exiv2/default.nix +++ b/nixpkgs/pkgs/development/libraries/exiv2/default.nix @@ -26,6 +26,11 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DEXIV2_BUILD_PO=ON" "-DEXIV2_BUILD_DOC=ON" + # the cmake package does not handle absolute CMAKE_INSTALL_INCLUDEDIR correctly + # (setting it to an absolute path causes include files to go to $out/$out/include, + # because the absolute path is interpreted with root at $out). + "-DCMAKE_INSTALL_INCLUDEDIR=include" + "-DCMAKE_INSTALL_LIBDIR=lib" ]; outputs = [ "out" "dev" "doc" "man" ]; @@ -69,7 +74,7 @@ stdenv.mkDerivation rec { ''} ${stdenv.lib.optionalString stdenv.isDarwin '' - export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:`pwd`/lib + export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}`pwd`/lib # Removing tests depending on charset conversion substituteInPlace ../test/Makefile --replace "conversions.sh" "" rm -f ../tests/bugfixes/redmine/test_issue_460.py |