3 files changed, 20 insertions, 4 deletions
diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix
index a126402cadf2..6d4431516f8e 100644
--- a/pkgs/applications/graphics/digikam/default.nix
+++ b/pkgs/applications/graphics/digikam/default.nix
@@ -3,17 +3,21 @@ kdegraphics, lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, kdeedu,
 liblqr1, lensfun, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "digikam-1.4.0";
+  name = "digikam-1.5.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/digikam/${name}.tar.bz2";
-    sha256 = "1fky4jkji9fkhzzvw7wic6xy7vkj9g39hx1xm76qxxq8i2nzlynk";
+    sha256 = "1vvzw132aw2c1z2v1zc3aqa99kvg501krr2law35ri12zkqjsvaz";
   };
 
   buildInputs = [ cmake qt4 kdelibs kdegraphics automoc4 phonon qimageblitz qca2 eigen
     lcms jasper libgphoto2 kdepimlibs gettext soprano kdeedu liblqr1 lensfun
     pkgconfig ];
 
+  KDEDIRS=kdeedu;
+
+  patches = [ ./include.diff ];
+
   meta = {
     description = "Photo Management Program";
     license = "GPL";
diff --git a/pkgs/applications/graphics/digikam/include.diff b/pkgs/applications/graphics/digikam/include.diff
new file mode 100644
index 000000000000..0762ce04d263
--- /dev/null
+++ b/pkgs/applications/graphics/digikam/include.diff
@@ -0,0 +1,12 @@
+diff --git a/libs/imageproperties/markerclusterholderplugin/CMakeLists.txt b/libs/imageproperties/markerclusterholderplugin/CMakeLists.txt
+index 9ee36cc..c6e5c00 100644
+--- a/libs/imageproperties/markerclusterholderplugin/CMakeLists.txt
++++ b/libs/imageproperties/markerclusterholderplugin/CMakeLists.txt
+@@ -18,6 +18,7 @@ IF(MARBLEWIDGET_SUPPORTS_PLUGINS)
+ 
+     INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/libs/imageproperties/markerclusterholderplugin/
+                          ${CMAKE_BINARY_DIR}/libs/imageproperties/markerclusterholderplugin/
++						 ${LIBMARBLEWIDGET_INCLUDE_DIR}/..
+                          ${QT_INCLUDE_DIR}
+                        )
+ 
diff --git a/pkgs/applications/graphics/kipi-plugins/default.nix b/pkgs/applications/graphics/kipi-plugins/default.nix
index 22174333a4d0..c3fe93a77ea8 100644
--- a/pkgs/applications/graphics/kipi-plugins/default.nix
+++ b/pkgs/applications/graphics/kipi-plugins/default.nix
@@ -2,11 +2,11 @@
 kdegraphics, kdepimlibs, libxml2, libxslt, gettext, opencv, libgpod, gtk }:
 
 stdenv.mkDerivation rec {
-  name = "kipi-plugins-1.4.0";
+  name = "kipi-plugins-1.5.0";
 
   src = fetchurl { 
     url = "mirror://sourceforge/kipi/${name}.tar.bz2";
-    sha256 = "1ybxhp4rs6c5xlrs0q765vrx4mvw4k0kq6n42dyk3kxvmcb9iq34";
+    sha256 = "1wsqh0lbsqyzdfmb9f53bmmypw00n80p62ym4pnxb8w0zwlhbkbw";
   };
 
   buildInputs = [ cmake qt4 kdelibs kdegraphics automoc4 phonon qimageblitz qca2 kdepimlibs