From d975d5da8b8b55f8cbf52784fdb4e2909fb5f244 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 16 Jun 2016 09:28:00 -0500
Subject: [PATCH] kde5.khelpcenter: moved from Plasma 5.6.4 to Applications
 16.04.2

---
 .../kde-5/applications-16.04/default.nix      |  1 +
 .../kde-5/applications-16.04/khelpcenter.nix  | 20 +++++++++++++++++++
 pkgs/desktops/kde-5/plasma-5.6/default.nix    |  1 -
 .../desktops/kde-5/plasma-5.6/khelpcenter.nix | 20 -------------------
 4 files changed, 21 insertions(+), 21 deletions(-)
 create mode 100644 pkgs/desktops/kde-5/applications-16.04/khelpcenter.nix
 delete mode 100644 pkgs/desktops/kde-5/plasma-5.6/khelpcenter.nix

diff --git a/pkgs/desktops/kde-5/applications-16.04/default.nix b/pkgs/desktops/kde-5/applications-16.04/default.nix
index 7000c962270..e026914f2f0 100644
--- a/pkgs/desktops/kde-5/applications-16.04/default.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/default.nix
@@ -48,6 +48,7 @@ let
     kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {};
     kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {};
     kgpg = callPackage ./kgpg.nix { inherit (pkgs.kde4) kdepimlibs; };
+    khelpcenter = callPackage ./khelpcenter.nix {};
     kio-extras = callPackage ./kio-extras.nix {};
     konsole = callPackage ./konsole.nix {};
     libkdcraw = callPackage ./libkdcraw.nix {};
diff --git a/pkgs/desktops/kde-5/applications-16.04/khelpcenter.nix b/pkgs/desktops/kde-5/applications-16.04/khelpcenter.nix
new file mode 100644
index 00000000000..3cdcf22cf75
--- /dev/null
+++ b/pkgs/desktops/kde-5/applications-16.04/khelpcenter.nix
@@ -0,0 +1,20 @@
+{ kdeApp, extra-cmake-modules, kdoctools, makeQtWrapper
+, grantlee, kconfig, kcoreaddons, kdbusaddons, ki18n, kinit, kcmutils
+, kdelibs4support, khtml, kservice
+, xapian
+}:
+
+kdeApp {
+  name = "khelpcenter";
+  nativeBuildInputs = [
+    extra-cmake-modules kdoctools makeQtWrapper
+  ];
+  buildInputs = [
+    grantlee kdelibs4support khtml ki18n kconfig kcoreaddons kdbusaddons kinit
+    kcmutils kservice
+    xapian
+  ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/khelpcenter"
+  '';
+}
diff --git a/pkgs/desktops/kde-5/plasma-5.6/default.nix b/pkgs/desktops/kde-5/plasma-5.6/default.nix
index b0f53eca6f7..b1076548069 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/default.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/default.nix
@@ -61,7 +61,6 @@ let
     kdecoration = callPackage ./kdecoration.nix {};
     kdeplasma-addons = callPackage ./kdeplasma-addons.nix {};
     kgamma5 = callPackage ./kgamma5.nix {};
-    khelpcenter = callPackage ./khelpcenter.nix {};
     khotkeys = callPackage ./khotkeys.nix {};
     kinfocenter = callPackage ./kinfocenter.nix {};
     kmenuedit = callPackage ./kmenuedit.nix {};
diff --git a/pkgs/desktops/kde-5/plasma-5.6/khelpcenter.nix b/pkgs/desktops/kde-5/plasma-5.6/khelpcenter.nix
deleted file mode 100644
index 3ded239b09b..00000000000
--- a/pkgs/desktops/kde-5/plasma-5.6/khelpcenter.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ plasmaPackage, extra-cmake-modules, kdoctools, kconfig
-, kcoreaddons, kdbusaddons, ki18n, kinit, kcmutils, kdelibs4support
-, khtml, kservice, makeQtWrapper
-}:
-
-plasmaPackage {
-  name = "khelpcenter";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-    makeQtWrapper
-  ];
-  propagatedBuildInputs = [
-    kdelibs4support khtml ki18n kconfig kcoreaddons kdbusaddons kinit kcmutils
-    kservice
-  ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/khelpcenter"
-  '';
-}