kde5.oxygen: use kdeWrapper instead of makeQtWrapper

This commit is contained in:
Thomas Tuegel 2016-11-13 15:36:32 -06:00
parent dc598510aa
commit 87c4a20cb8
No known key found for this signature in database
GPG Key ID: 22CBF5249D4B4D59

View File

@ -1,19 +1,20 @@
{ {
plasmaPackage, plasmaPackage, kdeWrapper,
ecm, makeQtWrapper, ecm,
frameworkintegration, kcmutils, kcompletion, kconfig, kdecoration, kguiaddons, frameworkintegration, kcmutils, kcompletion, kconfig, kdecoration, kguiaddons,
ki18n, kwidgetsaddons, kservice, kwayland, kwindowsystem, qtx11extras ki18n, kwidgetsaddons, kservice, kwayland, kwindowsystem, qtx11extras
}: }:
plasmaPackage { let
unwrapped = plasmaPackage {
name = "oxygen"; name = "oxygen";
nativeBuildInputs = [ ecm makeQtWrapper ]; nativeBuildInputs = [ ecm ];
propagatedBuildInputs = [ propagatedBuildInputs = [
frameworkintegration kcmutils kcompletion kconfig kdecoration kguiaddons frameworkintegration kcmutils kcompletion kconfig kdecoration kguiaddons
ki18n kservice kwayland kwidgetsaddons kwindowsystem qtx11extras ki18n kservice kwayland kwidgetsaddons kwindowsystem qtx11extras
]; ];
postInstall = '' };
wrapQtProgram "$out/bin/oxygen-demo5" in
wrapQtProgram "$out/bin/oxygen-settings5" kdeWrapper unwrapped {
''; targets = [ "bin/oxygen-demo5" "bin/oxygen-settings5" ];
} }