Merge branch 'kipi-plugins'

pkgs/applications/graphics/kipi-plugins/5.x.nix

@@ -0,0 +1,34 @@
+{
+  stdenv, fetchurl,
+  ecm,
+  karchive, kconfig, ki18n, kiconthemes, kio, kservice, kwindowsystem, kxmlgui,
+  libkipi, qtbase, qtsvg, qtxmlpatterns
+}:
+
+stdenv.mkDerivation rec {
+  name    = "kipi-plugins-${version}";
+  version = "5.2.0";
+
+  src = fetchurl {
+    url = "http://download.kde.org/stable/digikam/digikam-${version}.tar.xz";
+    sha256 = "0q4j7iv20cxgfsr14qwzx05wbp2zkgc7cg2pi7ibcnwba70ky96g";
+  };
+
+  prePatch = ''
+    cd extra/kipi-plugins
+  '';
+
+  nativeBuildInputs = [ ecm ];
+  buildInputs = [
+    karchive kconfig ki18n kiconthemes kio kservice kwindowsystem kxmlgui libkipi
+    qtbase qtsvg qtxmlpatterns
+  ];
+
+  meta = {
+    description = "Plugins for KDE-based image applications";
+    license = stdenv.lib.licenses.gpl2;
+    homepage = http://www.digikam.org;
+    maintainers = with stdenv.lib.maintainers; [ ttuegel ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}

pkgs/desktops/kde-5/applications/default.nix

@@ -64,6 +64,9 @@ let
     spectacle = callPackage ./spectacle.nix {};
 
     l10n = pkgs.recurseIntoAttrs (import ./l10n.nix { inherit callPackage lib pkgs; });
+
+    # External packages
+    kipi-plugins = callPackage ../../../applications/graphics/kipi-plugins/5.x.nix {};
   };
 
 in packages

pkgs/desktops/kde-5/applications/gwenview.nix

@@ -1,8 +1,8 @@
 {
   kdeApp, lib, kdeWrapper,
   ecm, kdoctools,
-  baloo, exiv2, kactivities, kdelibs4support, kio, lcms2, libkdcraw, libkipi,
+  baloo, exiv2, kactivities, kdelibs4support, kio, kipi-plugins, lcms2,
-  phonon, qtsvg, qtx11extras
+  libkdcraw, libkipi, phonon, qtsvg, qtx11extras
 }:
 
 let
@@ -20,4 +20,7 @@ let
       ];
     };
 in
-kdeWrapper unwrapped { targets = [ "bin/gwenview" ]; }
+kdeWrapper unwrapped {
+  targets = [ "bin/gwenview" ];
+  paths = [ kipi-plugins ];
+}

pkgs/desktops/kde-5/applications/spectacle.nix

@@ -1,8 +1,9 @@
 {
   kdeApp, lib, kdeWrapper,
   ecm, kdoctools,
-  kconfig, kcoreaddons, kdbusaddons, kdeclarative, ki18n, kio, knotifications,
+  kconfig, kcoreaddons, kdbusaddons, kdeclarative, ki18n, kio, kipi-plugins,
-  kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi, xcb-util-cursor
+  knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi,
+  xcb-util-cursor
 }:
 
 let
@@ -17,4 +18,7 @@ let
       ];
     };
 in
-kdeWrapper unwrapped { targets = [ "bin/spectacle" ]; }
+kdeWrapper unwrapped {
+  targets = [ "bin/spectacle" ];
+  paths = [ kipi-plugins ];
+}