summary refs log tree commit diff
path: root/pkgs/applications/graphics/digikam
diff options
context:
space:
mode:
authorThomas Tuegel <ttuegel@mailbox.org>2020-09-26 06:18:06 -0500
committerGitHub <noreply@github.com>2020-09-26 06:18:06 -0500
commitb10e170cb381a488e10d317f8ff90eeec2a1e371 (patch)
treedc3b4e2dc9c24a05df43c381a48a94f3d1a17e58 /pkgs/applications/graphics/digikam
parent2e48e306f66cdd3d5f90e412a2fb8d53cc8cff93 (diff)
parenta9e0dd08d164e2c40d1c1e143f36c492b4301546 (diff)
downloadnixpkgs-b10e170cb381a488e10d317f8ff90eeec2a1e371.tar
nixpkgs-b10e170cb381a488e10d317f8ff90eeec2a1e371.tar.gz
nixpkgs-b10e170cb381a488e10d317f8ff90eeec2a1e371.tar.bz2
nixpkgs-b10e170cb381a488e10d317f8ff90eeec2a1e371.tar.lz
nixpkgs-b10e170cb381a488e10d317f8ff90eeec2a1e371.tar.xz
nixpkgs-b10e170cb381a488e10d317f8ff90eeec2a1e371.tar.zst
nixpkgs-b10e170cb381a488e10d317f8ff90eeec2a1e371.zip
Merge pull request #98721 from callahad/digikam-7.1.0
digikam: 6.4.0 -> 7.1.0
Diffstat (limited to 'pkgs/applications/graphics/digikam')
-rw-r--r--pkgs/applications/graphics/digikam/default.nix12
1 files changed, 9 insertions, 3 deletions
diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix
index d8cdfc6c8a9..52de023e168 100644
--- a/pkgs/applications/graphics/digikam/default.nix
+++ b/pkgs/applications/graphics/digikam/default.nix
@@ -26,6 +26,8 @@
 , exiv2
 , ffmpeg
 , flex
+, graphviz
+, imagemagick
 , lcms2
 , lensfun
 , libgphoto2
@@ -40,6 +42,7 @@
 , opencv3
 , pcre
 , threadweaver
+, x265
 
 # For panorama and focus stacking
 , enblend-enfuse
@@ -52,11 +55,11 @@
 
 mkDerivation rec {
   pname   = "digikam";
-  version = "6.4.0";
+  version = "7.1.0";
 
   src = fetchurl {
-    url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.xz";
-    sha256 = "0vwd97zkxv30y8x0z76s4fsj4w9ysgsmpjclp2h2bpava7zi4l3p";
+    url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz";
+    sha256 = "1gmblnsm0aida3yynyddm6jdh59hx3w177hrhfar616z793ch0xi";
   };
 
   nativeBuildInputs = [ cmake doxygen extra-cmake-modules kdoctools wrapGAppsHook ];
@@ -68,6 +71,8 @@ mkDerivation rec {
     exiv2
     ffmpeg
     flex
+    graphviz
+    imagemagick
     lcms2
     lensfun
     libgphoto2
@@ -80,6 +85,7 @@ mkDerivation rec {
     libGLU
     opencv3
     pcre
+    x265
 
     qtbase
     qtxmlpatterns