Remove kde4.kipi_plugins

- Already updated to KDE 5 in Nixpkgs

3 files changed, 25 insertions, 56 deletions

diff --git a/pkgs/applications/graphics/kipi-plugins/5.x.nix b/pkgs/applications/graphics/kipi-plugins/5.x.nix
deleted file mode 100644
index 2f6cc8e4ece0..000000000000
--- a/pkgs/applications/graphics/kipi-plugins/5.x.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  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;
-  };
-}
diff --git a/pkgs/applications/graphics/kipi-plugins/default.nix b/pkgs/applications/graphics/kipi-plugins/default.nix
index b69105fba7c8..2f6cc8e4ece0 100644
--- a/pkgs/applications/graphics/kipi-plugins/default.nix
+++ b/pkgs/applications/graphics/kipi-plugins/default.nix
@@ -1,30 +1,34 @@
-{ stdenv, fetchurl, kdelibs, qimageblitz, qca2, kdepimlibs, libxml2, libxslt
-, gettext, opencv, libgpod, gdk_pixbuf , qjson, pkgconfig
-, cmake, automoc4
-, kdegraphics, libkexiv2 ? kdegraphics, libkdcraw ? kdegraphics
-, libkipi ? kdegraphics, libksane ? kdegraphics }:
+{
+  stdenv, fetchurl,
+  ecm,
+  karchive, kconfig, ki18n, kiconthemes, kio, kservice, kwindowsystem, kxmlgui,
+  libkipi, qtbase, qtsvg, qtxmlpatterns
+}:
 
 stdenv.mkDerivation rec {
-  name = "kipi-plugins-1.9.0";
+  name    = "kipi-plugins-${version}";
+  version = "5.2.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/kipi/${name}.tar.bz2";
-    sha256 = "0k4k9v1rj7129n0s0i5pvv4rabx0prxqs6sca642fj95cxc6c96m";
+    url = "http://download.kde.org/stable/digikam/digikam-${version}.tar.xz";
+    sha256 = "0q4j7iv20cxgfsr14qwzx05wbp2zkgc7cg2pi7ibcnwba70ky96g";
   };
 
-  buildInputs =
-    [ kdelibs libkexiv2 libkdcraw libkipi qimageblitz qca2 kdepimlibs libxml2
-      libksane libxslt gettext opencv libgpod gdk_pixbuf qjson
-    ];
+  prePatch = ''
+    cd extra/kipi-plugins
+  '';
 
-  nativeBuildInputs = [ pkgconfig cmake automoc4 ];
+  nativeBuildInputs = [ ecm ];
+  buildInputs = [
+    karchive kconfig ki18n kiconthemes kio kservice kwindowsystem kxmlgui libkipi
+    qtbase qtsvg qtxmlpatterns
+  ];
 
   meta = {
-    description = "Photo Management Program";
-    license = "GPL";
-    homepage = http://www.kipi-plugins.org;
-    inherit (kdelibs.meta) platforms;
-    maintainers = with stdenv.lib.maintainers; [ viric urkud ];
-    broken = true; # it should be built from digikam sources, perhaps together
+    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;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7273ba75c509..e776a41ee686 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14009,6 +14009,8 @@ with pkgs;
     ffmpeg = ffmpeg_2;
   };
 
+  kipi-plugins = kde5.callPackage ../applications/graphics/kipi-plugins {};
+
   kiwix = callPackage ../applications/misc/kiwix {
     stdenv = overrideCC stdenv gcc49;
   };
@@ -16713,8 +16715,6 @@ with pkgs;
 
         kmplayer = callPackage ../applications/video/kmplayer { };
 
-        kipi_plugins = callPackage ../applications/graphics/kipi-plugins { };
-
         ktikz = callPackage ../applications/graphics/ktikz { };
 
         kvirc = callPackage ../applications/networking/irc/kvirc { };
@@ -16789,7 +16789,6 @@ with pkgs;
           plasma = plasma self;
           frameworks = qt5.kdeFrameworks;
           applications = applications self;
-          kipi-plugins = self.callPackage ../applications/graphics/kipi-plugins/5.x.nix {};
         }
         // qt5.kdeFrameworks
         // plasma self