Remove kdeWrapper

2017-06-18 08:43:39 -05:00
parent 945758f960
commit be7b7d908f
44 changed files with 665 additions and 987 deletions
@@ -1,22 +1,15 @@
 {
-  mkDerivation, kdeWrapper,
-  extra-cmake-modules, kdoctools,
+  mkDerivation,
+  extra-cmake-modules, kdoctools, wrapGAppsHook,
  grantlee, kconfig, kcoreaddons, kdbusaddons, ki18n, kinit, kcmutils,
  kdelibs4support, khtml, kservice, xapian
 }:

-let
-  unwrapped =
-    mkDerivation {
-      name = "khelpcenter";
-      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-      buildInputs = [
-        grantlee kdelibs4support khtml ki18n kconfig kcoreaddons kdbusaddons
-        kinit kcmutils kservice xapian
-      ];
-    };
-in
-kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/khelpcenter" ];
+mkDerivation {
+  name = "khelpcenter";
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  buildInputs = [
+    grantlee kdelibs4support khtml ki18n kconfig kcoreaddons kdbusaddons
+    kinit kcmutils kservice xapian
+  ];
 }