digikam: updating (2.9 for kde 4.7/8, 3.2 for kde 4.10)

2 files changed, 34 insertions, 2 deletions

diff --git a/pkgs/applications/graphics/digikam/2.nix b/pkgs/applications/graphics/digikam/2.nix
new file mode 100644
index 00000000000..be991772d39
--- /dev/null
+++ b/pkgs/applications/graphics/digikam/2.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen,
+lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, libjpeg, libtiff,
+liblqr1, lensfun, pkgconfig, qjson, libkdcraw, opencv, libkexiv2, libkipi, boost,
+shared_desktop_ontologies, marble, mysql }:
+
+stdenv.mkDerivation rec {
+  name = "digikam-2.9.0";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/digikam/${name}.tar.bz2";
+    sha256 = "181vf065j1zz26zahkb7hy3fk4837nvwm61cnykvni7w40w0zpbk";
+  };
+
+  nativeBuildInputs = [ cmake automoc4 pkgconfig ];
+
+  buildInputs = [ qt4 kdelibs phonon qimageblitz qca2 eigen lcms libjpeg libtiff
+    jasper libgphoto2 kdepimlibs gettext soprano liblqr1 lensfun qjson libkdcraw
+    opencv libkexiv2 libkipi boost shared_desktop_ontologies marble mysql ];
+
+  # Make digikam find some FindXXXX.cmake
+  KDEDIRS="${marble}:${qjson}";
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "Photo Management Program";
+    license = "GPL";
+    homepage = http://www.digikam.org;
+    maintainers = with stdenv.lib.maintainers; [ viric urkud ];
+    inherit (kdelibs.meta) platforms;
+  };
+}
diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix
index 7b92d5e1690..27d8ae546da 100644
--- a/pkgs/applications/graphics/digikam/default.nix
+++ b/pkgs/applications/graphics/digikam/default.nix
@@ -4,11 +4,11 @@ liblqr1, lensfun, pkgconfig, qjson, libkdcraw, opencv, libkexiv2, libkipi, boost
 shared_desktop_ontologies, marble, mysql }:
 
 stdenv.mkDerivation rec {
-  name = "digikam-2.6.0";
+  name = "digikam-3.2.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/digikam/${name}.tar.bz2";
-    sha256 = "1prnaywnbv0xpw6knqagzc4gn1vsj9kw2hvdasjwknc9ljiyl721";
+    sha256 = "06j858d2nvbqh0bw6m60rh1bsws06fm5vfjpwwi3zxsf5ka08wmx";
   };
 
   nativeBuildInputs = [ cmake automoc4 pkgconfig ];