Skip to content

Plasma Wayland #44139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ttuegel merged 2 commits into from
Jul 28, 2018
Merged

Plasma Wayland #44139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af44ab8
plasma.kwin: Adds libdrm depdency
bkchr Jul 26, 2018
6e5d977
plasma-workspace: Improve the NixOS patch set
bkchr Jul 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkgs/desktops/plasma-5/kwin/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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);
Expand Down
6 changes: 3 additions & 3 deletions pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down