diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-08-31 11:57:05 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-09-16 22:04:28 +0000 |
commit | a0842e8b20cbe1ed717b72775428d1f8fc047fa4 (patch) | |
tree | b86d0614a477f7e092d626d59b888d085aaca400 /nixpkgs/pkgs/development/libraries/exiv2 | |
parent | c36b32d476b520ed0d2a37cd0973f98583d6dc7c (diff) | |
parent | 8d1510abfb592339e13ce8f6db6f29c1f8b72924 (diff) | |
download | nixlib-a0842e8b20cbe1ed717b72775428d1f8fc047fa4.tar nixlib-a0842e8b20cbe1ed717b72775428d1f8fc047fa4.tar.gz nixlib-a0842e8b20cbe1ed717b72775428d1f8fc047fa4.tar.bz2 nixlib-a0842e8b20cbe1ed717b72775428d1f8fc047fa4.tar.lz nixlib-a0842e8b20cbe1ed717b72775428d1f8fc047fa4.tar.xz nixlib-a0842e8b20cbe1ed717b72775428d1f8fc047fa4.tar.zst nixlib-a0842e8b20cbe1ed717b72775428d1f8fc047fa4.zip |
Merge commit '8d1510abfb592339e13ce8f6db6f29c1f8b72924'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/exiv2')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/exiv2/default.nix | 21 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/libraries/exiv2/fix-cmake.patch | 16 |
2 files changed, 12 insertions, 25 deletions
diff --git a/nixpkgs/pkgs/development/libraries/exiv2/default.nix b/nixpkgs/pkgs/development/libraries/exiv2/default.nix index 9b05165e1b2b..ec6f07f0953a 100644 --- a/nixpkgs/pkgs/development/libraries/exiv2/default.nix +++ b/nixpkgs/pkgs/development/libraries/exiv2/default.nix @@ -14,20 +14,15 @@ stdenv.mkDerivation rec { pname = "exiv2"; - version = "0.27.1"; + version = "0.27.2"; src = fetchFromGitHub rec { owner = "exiv2"; repo = "exiv2"; - rev = version; - sha256 = "0b5m921070fkyif0zlyb49gly3p6xd0hv1jyym4j25hx12gzbx0c"; + rev = "v${version}"; + sha256 = "0n8il52yzbmvbkryrl8waz7hd9a2fdkw8zsrmhyh63jlvmmc31gf"; }; - patches = [ - # https://github.com/Exiv2/exiv2/commit/aae88060ca85a483cd7fe791ba116c04d96c0bf9#comments - ./fix-cmake.patch - ]; - cmakeFlags = [ "-DEXIV2_BUILD_PO=ON" "-DEXIV2_BUILD_DOC=ON" @@ -58,7 +53,7 @@ stdenv.mkDerivation rec { "doc" ]; - doCheck = stdenv.isLinux; + doCheck = true; # Test setup found by inspecting ${src}/.travis/run.sh; problems without cmake. checkTarget = "tests"; @@ -72,6 +67,14 @@ stdenv.mkDerivation rec { ${stdenv.lib.optionalString stdenv.isAarch64 '' rm -f ../tests/bugfixes/github/test_CVE_2018_12265.py ''} + + ${stdenv.lib.optionalString stdenv.isDarwin '' + export 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 + rm -f ../tests/bugfixes/redmine/test_issue_662.py + ''} ''; postCheck = '' diff --git a/nixpkgs/pkgs/development/libraries/exiv2/fix-cmake.patch b/nixpkgs/pkgs/development/libraries/exiv2/fix-cmake.patch deleted file mode 100644 index 1e19aed8b904..000000000000 --- a/nixpkgs/pkgs/development/libraries/exiv2/fix-cmake.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 34087004..41b3a068 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -239,9 +239,9 @@ install(FILES - ${CMAKE_BINARY_DIR}/exiv2lib_export.h - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/exiv2) - --install(EXPORT exiv2Config DESTINATION "${CMAKE_INSTALL_LIBDIR}/exiv2/cmake") -+install(EXPORT exiv2Config DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/exiv2") - --install(FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2ConfigVersion.cmake DESTINATION "${CMAKE_INSTALL_LIBDIR}/exiv2/cmake") -+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2ConfigVersion.cmake DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/exiv2") - - # ****************************************************************************** - # exiv2 application |