summary refs log tree commit diff
path: root/pkgs/applications/kde/kate.nix
diff options
context:
space:
mode:
authorThomas Tuegel <ttuegel@mailbox.org>2017-05-16 10:56:41 -0500
committerThomas Tuegel <ttuegel@mailbox.org>2017-06-18 08:43:39 -0500
commitbe7b7d908f82e8ab16c43ffd0e240addd6f4018a (patch)
tree81d875bcec94de6d94ce20725393d9c35f1c165a /pkgs/applications/kde/kate.nix
parent945758f96030ee7762ccdab32a3ffddd028b37b6 (diff)
downloadnixpkgs-be7b7d908f82e8ab16c43ffd0e240addd6f4018a.tar
nixpkgs-be7b7d908f82e8ab16c43ffd0e240addd6f4018a.tar.gz
nixpkgs-be7b7d908f82e8ab16c43ffd0e240addd6f4018a.tar.bz2
nixpkgs-be7b7d908f82e8ab16c43ffd0e240addd6f4018a.tar.lz
nixpkgs-be7b7d908f82e8ab16c43ffd0e240addd6f4018a.tar.xz
nixpkgs-be7b7d908f82e8ab16c43ffd0e240addd6f4018a.tar.zst
nixpkgs-be7b7d908f82e8ab16c43ffd0e240addd6f4018a.zip
Remove kdeWrapper
Diffstat (limited to 'pkgs/applications/kde/kate.nix')
-rw-r--r--pkgs/applications/kde/kate.nix40
1 files changed, 16 insertions, 24 deletions
diff --git a/pkgs/applications/kde/kate.nix b/pkgs/applications/kde/kate.nix
index 7a138afb8ed..357abf96505 100644
--- a/pkgs/applications/kde/kate.nix
+++ b/pkgs/applications/kde/kate.nix
@@ -1,32 +1,24 @@
 {
-  mkDerivation, lib, kdeWrapper,
-  extra-cmake-modules, kdoctools,
+  mkDerivation, lib,
+  extra-cmake-modules, kdoctools, wrapGAppsHook,
   kactivities, kconfig, kcrash, kdbusaddons, kguiaddons, kiconthemes, ki18n,
   kinit, kio, kitemmodels, kjobwidgets, knewstuff, knotifications, konsole,
   kparts, ktexteditor, kwindowsystem, kwallet, kxmlgui, libgit2,
   plasma-framework, qtscript, threadweaver
 }:
 
-let
-  unwrapped =
-    mkDerivation {
-      name = "kate";
-      meta = {
-        license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ];
-        maintainers = [ lib.maintainers.ttuegel ];
-      };
-      nativeBuildInputs = [ extra-cmake-modules 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
-{
-  inherit unwrapped;
-  targets = [ "bin/kate" "bin/kwrite" ];
-  paths = [ konsole.unwrapped ];
+mkDerivation {
+  name = "kate";
+  meta = {
+    license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  propagatedBuildInputs = [
+    kactivities ki18n kio ktexteditor kwindowsystem plasma-framework
+    qtscript kconfig kcrash kguiaddons kiconthemes kinit kjobwidgets kparts
+    kxmlgui kdbusaddons kwallet kitemmodels knotifications threadweaver
+    knewstuff libgit2
+  ];
+  propagatedUserEnvPkgs = [ konsole ];
 }