mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-06 17:13:24 -05:00
[Backport release-26.05] digikam: 9.0.0 -> 9.1.0 (#530128)
This commit is contained in:
commit
6875bc2952
2 changed files with 8 additions and 6 deletions
|
|
@ -1,15 +1,16 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 43636fa9b9...e8da76c480 100644
|
||||
index f0dbdd9aa5..368d481fd8 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -208,10 +208,6 @@
|
||||
@@ -237,11 +237,6 @@ if(BUILD_TESTING)
|
||||
# For CI runners to run tests, the following custom target serves to perform the download automatically.
|
||||
# If the directory "test-data" has already been created, the target becomes a "no-op".
|
||||
#
|
||||
- add_custom_command(OUTPUT ${CMAKE_SOURCE_DIR}/test-data
|
||||
- add_custom_command(OUTPUT ${CMAKE_SOURCE_DIR}/test-data
|
||||
- COMMENT "Checkout unit-test data repository. Please wait..."
|
||||
- COMMAND git
|
||||
- ARGS clone https://invent.kde.org/graphics/digikam-test-data.git ${CMAKE_SOURCE_DIR}/test-data)
|
||||
- ARGS clone https://invent.kde.org/graphics/digikam-test-data.git ${CMAKE_SOURCE_DIR}/test-data
|
||||
- )
|
||||
add_custom_target(test-data ALL DEPENDS ${CMAKE_SOURCE_DIR}/test-data)
|
||||
|
||||
endif()
|
||||
|
|
|
|||
|
|
@ -63,14 +63,14 @@ in
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "digikam";
|
||||
version = "9.0.0";
|
||||
version = "9.1.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "invent.kde.org";
|
||||
owner = "graphics";
|
||||
repo = "digikam";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-zYOtTL4qEjXa/ZYlDIvneziYBXq4tIiVjRsrSJMaS0k=";
|
||||
hash = "sha256-rrAqHSG7AsyG8DM0zYfyuGyu6jI/ZDmSYco91nhdmhQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -169,6 +169,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "BUILD_WITH_QT6" true)
|
||||
(lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck)
|
||||
(lib.cmakeBool "ENABLE_KFILEMETADATASUPPORT" true)
|
||||
#(lib.cmakeBool "ENABLE_AKONADICONTACTSUPPORT" true)
|
||||
(lib.cmakeBool "ENABLE_MEDIAPLAYER" true)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue