diff options
| author | Marek Mahut <marek.mahut@gmail.com> | 2019-08-25 18:49:35 +0200 |
|---|---|---|
| committer | Marek Mahut <marek.mahut@gmail.com> | 2019-08-25 18:49:35 +0200 |
| commit | 04de5d7c3c13956252ebb6942f94abbd972883c0 (patch) | |
| tree | c14a1726721e9aaafc1f4b0cfe79b38d094cab0b /pkgs/development/libraries | |
| parent | a1de8adf4fc4a451c1ad86c2323748b27cb62eab (diff) | |
| download | nixlib-04de5d7c3c13956252ebb6942f94abbd972883c0.tar nixlib-04de5d7c3c13956252ebb6942f94abbd972883c0.tar.gz nixlib-04de5d7c3c13956252ebb6942f94abbd972883c0.tar.bz2 nixlib-04de5d7c3c13956252ebb6942f94abbd972883c0.tar.lz nixlib-04de5d7c3c13956252ebb6942f94abbd972883c0.tar.xz nixlib-04de5d7c3c13956252ebb6942f94abbd972883c0.tar.zst nixlib-04de5d7c3c13956252ebb6942f94abbd972883c0.zip | |
exiv2: 0.27.1 -> 0.27.2
Fixes #67194
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/exiv2/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/development/libraries/exiv2/fix-cmake.patch | 16 |
2 files changed, 3 insertions, 24 deletions
diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index 9b05165e1b2b..f0e685d3daf0 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/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" diff --git a/pkgs/development/libraries/exiv2/fix-cmake.patch b/pkgs/development/libraries/exiv2/fix-cmake.patch deleted file mode 100644 index 1e19aed8b904..000000000000 --- a/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 |