Merge pull request #7875 from fkz/digikam

updated digikam to version 4.10.0
This commit is contained in:
goibhniu 2015-06-05 17:53:55 +02:00
commit c17aa9d3c6

View File

@ -6,11 +6,11 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "digikam-4.6.0"; name = "digikam-4.10.0";
src = fetchurl { src = fetchurl {
url = "http://download.kde.org/stable/digikam/${name}.tar.bz2"; url = "http://download.kde.org/stable/digikam/${name}.tar.bz2";
sha256 = "0id3anikki8c3rzqzapdbg00h577qwybknvkbz1kdq0348bs6ixh"; sha256 = "4207e68b6221307111b66bb69485d3e88150df95dae014a99f6f161a3da0c725";
}; };
nativeBuildInputs = [ cmake automoc4 pkgconfig ]; nativeBuildInputs = [ cmake automoc4 pkgconfig ];
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
KDEDIRS="${marble}:${qjson}"; KDEDIRS="${marble}:${qjson}";
# Help digiKam find libusb, otherwise gphoto2 support is disabled # 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; enableParallelBuilding = true;