diff options
| author | Marek Mahut <marek.mahut@gmail.com> | 2019-08-26 10:36:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-26 10:36:14 +0200 |
| commit | 3052cc1c1bfca376e2359247283f1c32c73c5fe6 (patch) | |
| tree | 2c30875941925ea753defd1aae96f113d0582d8d /pkgs/development | |
| parent | bcbea53e12535eb36dbb09d252416822ba58c5e3 (diff) | |
| parent | 336eb202f633dfb9cb46a8b8a6d95a4ea343b3d3 (diff) | |
| download | nixpkgs-3052cc1c1bfca376e2359247283f1c32c73c5fe6.tar nixpkgs-3052cc1c1bfca376e2359247283f1c32c73c5fe6.tar.gz nixpkgs-3052cc1c1bfca376e2359247283f1c32c73c5fe6.tar.bz2 nixpkgs-3052cc1c1bfca376e2359247283f1c32c73c5fe6.tar.lz nixpkgs-3052cc1c1bfca376e2359247283f1c32c73c5fe6.tar.xz nixpkgs-3052cc1c1bfca376e2359247283f1c32c73c5fe6.tar.zst nixpkgs-3052cc1c1bfca376e2359247283f1c32c73c5fe6.zip | |
Merge pull request #67453 from mmahut/exiv2
exiv2: 0.27.1 -> 0.27.2
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/exiv2/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/development/libraries/exiv2/fix-cmake.patch | 16 |
2 files changed, 3 insertions, 26 deletions
diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index 9b05165e1b2..85889cf8af1 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" @@ -58,8 +53,6 @@ stdenv.mkDerivation rec { "doc" ]; - doCheck = stdenv.isLinux; - # Test setup found by inspecting ${src}/.travis/run.sh; problems without cmake. checkTarget = "tests"; diff --git a/pkgs/development/libraries/exiv2/fix-cmake.patch b/pkgs/development/libraries/exiv2/fix-cmake.patch deleted file mode 100644 index 1e19aed8b90..00000000000 --- 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 |