diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2016-11-13 15:36:32 -0600 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2016-11-15 07:21:39 -0600 |
| commit | 87c4a20cb8be2559cc66297f1ad51738f2ed420b (patch) | |
| tree | 290c50ca8652d3ff41e87456e1273d6eb2ccbcf7 /pkgs | |
| parent | dc598510aab4fb91c9ad5e2bb0bdba44a668add7 (diff) | |
| download | nixlib-87c4a20cb8be2559cc66297f1ad51738f2ed420b.tar nixlib-87c4a20cb8be2559cc66297f1ad51738f2ed420b.tar.gz nixlib-87c4a20cb8be2559cc66297f1ad51738f2ed420b.tar.bz2 nixlib-87c4a20cb8be2559cc66297f1ad51738f2ed420b.tar.lz nixlib-87c4a20cb8be2559cc66297f1ad51738f2ed420b.tar.xz nixlib-87c4a20cb8be2559cc66297f1ad51738f2ed420b.tar.zst nixlib-87c4a20cb8be2559cc66297f1ad51738f2ed420b.zip | |
kde5.oxygen: use kdeWrapper instead of makeQtWrapper
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/desktops/kde-5/plasma/oxygen.nix | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/pkgs/desktops/kde-5/plasma/oxygen.nix b/pkgs/desktops/kde-5/plasma/oxygen.nix index 44a7575526f1..f880f2e3ab23 100644 --- a/pkgs/desktops/kde-5/plasma/oxygen.nix +++ b/pkgs/desktops/kde-5/plasma/oxygen.nix @@ -1,19 +1,20 @@ { - plasmaPackage, - ecm, makeQtWrapper, + plasmaPackage, kdeWrapper, + ecm, frameworkintegration, kcmutils, kcompletion, kconfig, kdecoration, kguiaddons, ki18n, kwidgetsaddons, kservice, kwayland, kwindowsystem, qtx11extras }: -plasmaPackage { - name = "oxygen"; - nativeBuildInputs = [ ecm makeQtWrapper ]; - propagatedBuildInputs = [ - frameworkintegration kcmutils kcompletion kconfig kdecoration kguiaddons - ki18n kservice kwayland kwidgetsaddons kwindowsystem qtx11extras - ]; - postInstall = '' - wrapQtProgram "$out/bin/oxygen-demo5" - wrapQtProgram "$out/bin/oxygen-settings5" - ''; +let + unwrapped = plasmaPackage { + name = "oxygen"; + nativeBuildInputs = [ ecm ]; + propagatedBuildInputs = [ + frameworkintegration kcmutils kcompletion kconfig kdecoration kguiaddons + ki18n kservice kwayland kwidgetsaddons kwindowsystem qtx11extras + ]; + }; +in +kdeWrapper unwrapped { + targets = [ "bin/oxygen-demo5" "bin/oxygen-settings5" ]; } |