From 551f26fc71c7dd82751d9e5fda27caff1d3bc15c Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 30 Jul 2016 17:40:00 -0500 Subject: [PATCH] spectacle: use kdeWrapper --- .../desktops/kde-5/applications/spectacle.nix | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/desktops/kde-5/applications/spectacle.nix b/pkgs/desktops/kde-5/applications/spectacle.nix index 2665d840c38..26faea2678a 100644 --- a/pkgs/desktops/kde-5/applications/spectacle.nix +++ b/pkgs/desktops/kde-5/applications/spectacle.nix @@ -1,20 +1,20 @@ { - kdeApp, lib, ecm, kdoctools, makeQtWrapper, + kdeApp, lib, kdeWrapper, + ecm, kdoctools, kconfig, kcoreaddons, kdbusaddons, kdeclarative, ki18n, kio, knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi, xcb-util-cursor }: -kdeApp { - name = "spectacle"; - meta = with lib; { - maintainers = with maintainers; [ ttuegel ]; - }; - nativeBuildInputs = [ ecm kdoctools makeQtWrapper ]; - propagatedBuildInputs = [ - kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications - kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi xcb-util-cursor - ]; - postInstall = '' - wrapQtProgram "$out/bin/spectacle" - ''; -} +let + unwrapped = + kdeApp { + name = "spectacle"; + meta = with lib; { maintainers = with maintainers; [ ttuegel ]; }; + nativeBuildInputs = [ ecm kdoctools ]; + propagatedBuildInputs = [ + kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications + kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi xcb-util-cursor + ]; + }; +in +kdeWrapper unwrapped { targets = [ "bin/spectacle" ]; }