public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #44139 from bkchr/plasma_wayland

Browse Source 
Plasma Wayland
This commit is contained in:
Thomas Tuegel 2018-07-28 16:19:52 -05:00 committed by GitHub
commit 4ac6a8ba54
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/desktops/plasma-5/kwin/default.nix
View File

@ -11,7 +11,7 @@
kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel, ki18n, kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel, ki18n,
kiconthemes, kidletime, kinit, kio, knewstuff, knotifications, kpackage, kiconthemes, kidletime, kinit, kio, knewstuff, knotifications, kpackage,
kscreenlocker, kservice, kwayland, kwidgetsaddons, kwindowsystem, kxmlgui, kscreenlocker, kservice, kwayland, kwidgetsaddons, kwindowsystem, kxmlgui,
plasma-framework, qtsensors, libcap plasma-framework, qtsensors, libcap, libdrm
}: }:
mkDerivation { mkDerivation {
@ -27,7 +27,7 @@ mkDerivation {
kcoreaddons kcrash kdeclarative kdecoration kglobalaccel ki18n kiconthemes kcoreaddons kcrash kdeclarative kdecoration kglobalaccel ki18n kiconthemes
kidletime kinit kio knewstuff knotifications kpackage kscreenlocker kservice kidletime kinit kio knewstuff knotifications kpackage kscreenlocker kservice
kwayland kwidgetsaddons kwindowsystem kxmlgui plasma-framework kwayland kwidgetsaddons kwindowsystem kxmlgui plasma-framework
libcap libcap libdrm
]; ];
outputs = [ "bin" "dev" "out" ]; outputs = [ "bin" "dev" "out" ];
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);

6
pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch
View File

@ -907,10 +907,10 @@ index dd9e304d..49d456e9 100644
- } - }
fi fi
kstartupconfig5 -kstartupconfig5
+@CMAKE_INSTALL_FULL_BINDIR@/kstartupconfig5
returncode=$? returncode=$?
-if test $returncode -ne 0; then if test $returncode -ne 0; then
+if ! @CMAKE_INSTALL_FULL_BINDIR@/kstartupconfig5; then
exit 1 exit 1
fi fi
-[ -r $configDir/startupconfig ] && . $configDir/startupconfig -[ -r $configDir/startupconfig ] && . $configDir/startupconfig