Merge remote-tracking branch 'upstream/master' into hardened-stdenv

1 files changed, 22 insertions, 23 deletions

diff --git a/pkgs/desktops/kde-5/applications/kate.nix b/pkgs/desktops/kde-5/applications/kate.nix
index 94faa0655925..738266e8df7e 100644
--- a/pkgs/desktops/kde-5/applications/kate.nix
+++ b/pkgs/desktops/kde-5/applications/kate.nix
@@ -1,28 +1,27 @@
 {
-  kdeApp, lib, makeQtWrapper, extra-cmake-modules, kdoctools,
+  kdeApp, lib, kdeWrapper,
+  ecm, kdoctools,
   kactivities, kconfig, kcrash, kguiaddons, kiconthemes, ki18n, kinit,
   kjobwidgets, kio, kparts, ktexteditor, kwindowsystem, kxmlgui, kdbusaddons,
-  kwallet, plasma-framework, kitemmodels, knotifications, qtscript, threadweaver,
-  knewstuff, libgit2
+  kwallet, plasma-framework, kitemmodels, knotifications, qtscript,
+  threadweaver, knewstuff, libgit2
 }:
 
-kdeApp {
-  name = "kate";
-  meta = {
-    license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ];
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules kdoctools makeQtWrapper
-  ];
-  propagatedBuildInputs = [
-    kactivities ki18n kio ktexteditor kwindowsystem plasma-framework qtscript
-    kconfig kcrash kguiaddons kiconthemes kinit kjobwidgets kparts kxmlgui
-    kdbusaddons kwallet kitemmodels knotifications threadweaver knewstuff
-    libgit2
-  ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kate"
-    wrapQtProgram "$out/bin/kwrite"
-  '';
-}
+let
+  unwrapped =
+    kdeApp {
+      name = "kate";
+      meta = {
+        license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ];
+        maintainers = [ lib.maintainers.ttuegel ];
+      };
+      nativeBuildInputs = [ ecm kdoctools ];
+      propagatedBuildInputs = [
+        kactivities ki18n kio ktexteditor kwindowsystem plasma-framework
+        qtscript kconfig kcrash kguiaddons kiconthemes kinit kjobwidgets kparts
+        kxmlgui kdbusaddons kwallet kitemmodels knotifications threadweaver
+        knewstuff libgit2
+      ];
+    };
+in
+kdeWrapper unwrapped { targets = [ "bin/kate" "bin/kwrite" ]; }