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/okteta.nix | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) (limited to 'pkgs/applications/kde/okteta.nix') diff --git a/pkgs/applications/kde/okteta.nix b/pkgs/applications/kde/okteta.nix index 7fb4ffb7693a..350630664d92 100644 --- a/pkgs/applications/kde/okteta.nix +++ b/pkgs/applications/kde/okteta.nix @@ -1,26 +1,19 @@ { - mkDerivation, lib, kdeWrapper, - extra-cmake-modules, kdoctools, + mkDerivation, lib, + extra-cmake-modules, kdoctools, wrapGAppsHook, kconfig, kinit, kcmutils, kconfigwidgets, knewstuff, kparts, qca-qt5 }: -let - unwrapped = - mkDerivation { - name = "okteta"; - meta = { - license = with lib.licenses; [ gpl2 ]; - maintainers = with lib.maintainers; [ peterhoeg ]; - }; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ - kconfig kinit - kcmutils kconfigwidgets knewstuff kparts qca-qt5 - ]; - }; - -in kdeWrapper { - inherit unwrapped; - targets = [ "bin/okteta" ]; +mkDerivation { + name = "okteta"; + meta = { + license = with lib.licenses; [ gpl2 ]; + maintainers = with lib.maintainers; [ peterhoeg ]; + }; + nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; + propagatedBuildInputs = [ + kconfig kinit + kcmutils kconfigwidgets knewstuff kparts qca-qt5 + ]; } -- cgit 1.4.1