From be7b7d908f82e8ab16c43ffd0e240addd6f4018a Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 16 May 2017 10:56:41 -0500 Subject: Remove kdeWrapper --- pkgs/applications/kde/kgpg.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'pkgs/applications/kde/kgpg.nix') diff --git a/pkgs/applications/kde/kgpg.nix b/pkgs/applications/kde/kgpg.nix index 5b462c2712f5e..1a30b0685f889 100644 --- a/pkgs/applications/kde/kgpg.nix +++ b/pkgs/applications/kde/kgpg.nix @@ -1,6 +1,6 @@ { - mkDerivation, lib, makeQtWrapper, - extra-cmake-modules, kdoctools, ki18n, + mkDerivation, lib, + extra-cmake-modules, kdoctools, ki18n, wrapGAppsHook, akonadi-contacts, gnupg1, gpgme, karchive, kcodecs, kcontacts, kcoreaddons, kcrash, kdbusaddons, kiconthemes, kjobwidgets, kio, knotifications, kservice, ktextwidgets, kxmlgui, kwidgetsaddons, kwindowsystem @@ -8,14 +8,14 @@ mkDerivation { name = "kgpg"; - nativeBuildInputs = [ extra-cmake-modules kdoctools ki18n ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ki18n wrapGAppsHook ]; buildInputs = [ akonadi-contacts gnupg1 gpgme karchive kcodecs kcontacts kcoreaddons kcrash kdbusaddons kiconthemes kjobwidgets kio knotifications kservice ktextwidgets kxmlgui - kwidgetsaddons kwindowsystem makeQtWrapper + kwidgetsaddons kwindowsystem ]; - postInstall = '' - wrapQtProgram $out/bin/kgpg --suffix PATH : ${lib.makeBinPath [ gnupg1 ]} + preFixup = '' + gappsWrapperArgs+=(--suffix PATH : ${lib.makeBinPath [ gnupg1 ]}) ''; meta = { license = [ lib.licenses.gpl2 ]; -- cgit 1.4.1