commit
3052cc1c1b
@ -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";
|
||||
|
||||
|
@ -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
|
Loading…
Reference in New Issue
Block a user