summary refs log tree commit diff
path: root/pkgs/applications/kde/spectacle.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/spectacle.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/spectacle.nix')
-rw-r--r--pkgs/applications/kde/spectacle.nix29
1 files changed, 11 insertions, 18 deletions
diff --git a/pkgs/applications/kde/spectacle.nix b/pkgs/applications/kde/spectacle.nix
index a0c5ef58c9b..10d98d99b0b 100644
--- a/pkgs/applications/kde/spectacle.nix
+++ b/pkgs/applications/kde/spectacle.nix
@@ -1,25 +1,18 @@
 {
-  mkDerivation, lib, kdeWrapper,
-  extra-cmake-modules, kdoctools,
+  mkDerivation, lib,
+  extra-cmake-modules, kdoctools, wrapGAppsHook,
   kconfig, kcoreaddons, kdbusaddons, kdeclarative, ki18n, kio, kipi-plugins,
   knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi,
   xcb-util-cursor
 }:
 
-let
-  unwrapped =
-    mkDerivation {
-      name = "spectacle";
-      meta = with lib; { maintainers = with maintainers; [ ttuegel ]; };
-      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-      propagatedBuildInputs = [
-        kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications
-        kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi xcb-util-cursor
-      ];
-    };
-in
-kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/spectacle" ];
-  paths = [ kipi-plugins ];
+mkDerivation {
+  name = "spectacle";
+  meta = with lib; { maintainers = with maintainers; [ ttuegel ]; };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  propagatedBuildInputs = [
+    kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications
+    kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi xcb-util-cursor
+  ];
+  propagatedUserEnvPkgs = [ kipi-plugins ];
 }