diff options
author | Thomas Tuegel <ttuegel@mailbox.org> | 2017-05-17 14:26:11 -0500 |
---|---|---|
committer | Thomas Tuegel <ttuegel@mailbox.org> | 2017-06-18 08:44:42 -0500 |
commit | c816bbc8a86c7ea6c09ca42e1694fe08003a55fc (patch) | |
tree | 036a3c0d8a3a6a4be068cf153a863fc0114ef28f /pkgs/applications/kde/kgpg.nix | |
parent | 1607f51613fc63a6fbfc1884c55a9efea06161b3 (diff) | |
download | nixpkgs-c816bbc8a86c7ea6c09ca42e1694fe08003a55fc.tar nixpkgs-c816bbc8a86c7ea6c09ca42e1694fe08003a55fc.tar.gz nixpkgs-c816bbc8a86c7ea6c09ca42e1694fe08003a55fc.tar.bz2 nixpkgs-c816bbc8a86c7ea6c09ca42e1694fe08003a55fc.tar.lz nixpkgs-c816bbc8a86c7ea6c09ca42e1694fe08003a55fc.tar.xz nixpkgs-c816bbc8a86c7ea6c09ca42e1694fe08003a55fc.tar.zst nixpkgs-c816bbc8a86c7ea6c09ca42e1694fe08003a55fc.zip |
qt5: remove makeQtWrapper
Diffstat (limited to 'pkgs/applications/kde/kgpg.nix')
-rw-r--r-- | pkgs/applications/kde/kgpg.nix | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/pkgs/applications/kde/kgpg.nix b/pkgs/applications/kde/kgpg.nix index 1a30b0685f8..ca495a1ae26 100644 --- a/pkgs/applications/kde/kgpg.nix +++ b/pkgs/applications/kde/kgpg.nix @@ -1,21 +1,22 @@ { mkDerivation, lib, - extra-cmake-modules, kdoctools, ki18n, wrapGAppsHook, - akonadi-contacts, gnupg1, gpgme, karchive, kcodecs, kcontacts, kcoreaddons, kcrash, - kdbusaddons, kiconthemes, kjobwidgets, kio, knotifications, kservice, + extra-cmake-modules, kdoctools, ki18n, makeWrapper, + akonadi-contacts, gnupg1, gpgme, karchive, kcodecs, kcontacts, kcoreaddons, + kcrash, kdbusaddons, kiconthemes, kjobwidgets, kio, knotifications, kservice, ktextwidgets, kxmlgui, kwidgetsaddons, kwindowsystem }: mkDerivation { name = "kgpg"; - nativeBuildInputs = [ extra-cmake-modules kdoctools ki18n wrapGAppsHook ]; - buildInputs = [ - akonadi-contacts gnupg1 gpgme karchive kcodecs kcontacts kcoreaddons kcrash kdbusaddons + nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ]; + buildInputs = [ gnupg1 gpgme ki18n ]; + propagatedBuildInputs = [ + akonadi-contacts karchive kcodecs kcontacts kcoreaddons kcrash kdbusaddons kiconthemes kjobwidgets kio knotifications kservice ktextwidgets kxmlgui kwidgetsaddons kwindowsystem ]; - preFixup = '' - gappsWrapperArgs+=(--suffix PATH : ${lib.makeBinPath [ gnupg1 ]}) + postFixup = '' + wrapProgram "$out/bin/kgpg" --prefix PATH : "${lib.makeBinPath [ gnupg1 ]}" ''; meta = { license = [ lib.licenses.gpl2 ]; |