diff options
| author | Thomas Tuegel <ttuegel@secure.mailbox.org> | 2018-07-28 16:19:52 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-28 16:19:52 -0500 |
| commit | 4ac6a8ba542bd50c1f195ee54323c54e75152a9b (patch) | |
| tree | 22cca83a9462c3d2afca9add37242889bd224627 /pkgs/desktops | |
| parent | c835591870bb54d1d3f43e34bea9f158d40195e4 (diff) | |
| parent | 6e5d977b97966c832dfbb51c9dfded86e2bde172 (diff) | |
| download | nixlib-4ac6a8ba542bd50c1f195ee54323c54e75152a9b.tar nixlib-4ac6a8ba542bd50c1f195ee54323c54e75152a9b.tar.gz nixlib-4ac6a8ba542bd50c1f195ee54323c54e75152a9b.tar.bz2 nixlib-4ac6a8ba542bd50c1f195ee54323c54e75152a9b.tar.lz nixlib-4ac6a8ba542bd50c1f195ee54323c54e75152a9b.tar.xz nixlib-4ac6a8ba542bd50c1f195ee54323c54e75152a9b.tar.zst nixlib-4ac6a8ba542bd50c1f195ee54323c54e75152a9b.zip | |
Merge pull request #44139 from bkchr/plasma_wayland
Plasma Wayland
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/plasma-5/kwin/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix index a0b09e30338f..b8f381e97149 100644 --- a/pkgs/desktops/plasma-5/kwin/default.nix +++ b/pkgs/desktops/plasma-5/kwin/default.nix @@ -11,7 +11,7 @@ kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel, ki18n, kiconthemes, kidletime, kinit, kio, knewstuff, knotifications, kpackage, kscreenlocker, kservice, kwayland, kwidgetsaddons, kwindowsystem, kxmlgui, - plasma-framework, qtsensors, libcap + plasma-framework, qtsensors, libcap, libdrm }: mkDerivation { @@ -27,7 +27,7 @@ mkDerivation { kcoreaddons kcrash kdeclarative kdecoration kglobalaccel ki18n kiconthemes kidletime kinit kio knewstuff knotifications kpackage kscreenlocker kservice kwayland kwidgetsaddons kwindowsystem kxmlgui plasma-framework - libcap + libcap libdrm ]; outputs = [ "bin" "dev" "out" ]; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); diff --git a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch index 272088b72b7b..7f45d51d1609 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch +++ b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch @@ -907,10 +907,10 @@ index dd9e304d..49d456e9 100644 - } fi - kstartupconfig5 +-kstartupconfig5 ++@CMAKE_INSTALL_FULL_BINDIR@/kstartupconfig5 returncode=$? --if test $returncode -ne 0; then -+if ! @CMAKE_INSTALL_FULL_BINDIR@/kstartupconfig5; then + if test $returncode -ne 0; then exit 1 fi -[ -r $configDir/startupconfig ] && . $configDir/startupconfig |