summary refs log tree commit diff
path: root/pkgs/applications
diff options
context:
space:
mode:
authorgoibhniu <cillian.deroiste@gmail.com>2015-06-05 17:53:55 +0200
committergoibhniu <cillian.deroiste@gmail.com>2015-06-05 17:53:55 +0200
commitc17aa9d3c61d55435e90db9c919f3e4bd9dee3a4 (patch)
treee1caca98fc404c08180ad15c75aad65802d92c94 /pkgs/applications
parenta70d0275e27d5a26719cd53fa279a854819caf16 (diff)
parentfae6069309c373b9ad487d5012efb71145db1da6 (diff)
downloadnixlib-c17aa9d3c61d55435e90db9c919f3e4bd9dee3a4.tar
nixlib-c17aa9d3c61d55435e90db9c919f3e4bd9dee3a4.tar.gz
nixlib-c17aa9d3c61d55435e90db9c919f3e4bd9dee3a4.tar.bz2
nixlib-c17aa9d3c61d55435e90db9c919f3e4bd9dee3a4.tar.lz
nixlib-c17aa9d3c61d55435e90db9c919f3e4bd9dee3a4.tar.xz
nixlib-c17aa9d3c61d55435e90db9c919f3e4bd9dee3a4.tar.zst
nixlib-c17aa9d3c61d55435e90db9c919f3e4bd9dee3a4.zip
Merge pull request #7875 from fkz/digikam
updated digikam to version 4.10.0
Diffstat (limited to 'pkgs/applications')
-rw-r--r--pkgs/applications/graphics/digikam/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix
index 70966196b077..f86d3056db95 100644
--- a/pkgs/applications/graphics/digikam/default.nix
+++ b/pkgs/applications/graphics/digikam/default.nix
@@ -6,11 +6,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "digikam-4.6.0";
+  name = "digikam-4.10.0";
 
   src = fetchurl {
     url = "http://download.kde.org/stable/digikam/${name}.tar.bz2";
-    sha256 = "0id3anikki8c3rzqzapdbg00h577qwybknvkbz1kdq0348bs6ixh";
+    sha256 = "4207e68b6221307111b66bb69485d3e88150df95dae014a99f6f161a3da0c725";
   };
 
   nativeBuildInputs = [ cmake automoc4 pkgconfig ];
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   KDEDIRS="${marble}:${qjson}";
 
   # Help digiKam find libusb, otherwise gphoto2 support is disabled
-  cmakeFlags = "-DLIBUSB_LIBRARIES=${libusb1}/lib -DLIBUSB_INCLUDE_DIR=${libusb1}/include/libusb-1.0";
+  cmakeFlags = "-DLIBUSB_LIBRARIES=${libusb1}/lib -DLIBUSB_INCLUDE_DIR=${libusb1}/include/libusb-1.0 -DDIGIKAMSC_COMPILE_LIBKFACE=ON";
 
   enableParallelBuilding = true;