Skip to content

Commit

Permalink
Set PATH to use Xwayland wrapper
Browse files Browse the repository at this point in the history
Xwayland wrapper (that preloads shmoverride) is needed for the GUI
daemon to work. Set PATH for the plasma-kwin_wayland service that is
responsible for starting Xwayland.
Unfortunately the systemd service files do not support variable
expansion in Environment= setting, so hardcode original PATH value
too.

QubesOS/qubes-issues#8515
  • Loading branch information
marmarek committed Oct 14, 2024
1 parent 59da3c3 commit 1902f25
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 0 deletions.
2 changes: 2 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ install:
install -D -m 0644 plasmoidsetupscripts/template.js $(DESTDIR)/usr/share/plasma/look-and-feel/org.fedoraproject.fedora.desktop/contents/plasmoidsetupscripts/org.kde.plasma.kicker.js.qubes
install -D -m 0644 plasmoidsetupscripts/template.js $(DESTDIR)/usr/share/plasma/look-and-feel/org.fedoraproject.fedora.desktop/contents/plasmoidsetupscripts/org.kde.plasma.kickerdash.js.qubes
install -D -m 0644 plasmoidsetupscripts/template.js $(DESTDIR)/usr/share/plasma/look-and-feel/org.fedoraproject.fedora.desktop/contents/plasmoidsetupscripts/org.kde.plasma.kickoff.js.qubes
install -D -m 0644 config/10-gui-daemon-shmoverride.conf \
$(DESTDIR)/usr/lib/systemd/user/plasma-kwin_wayland.service.d/10-gui-daemon-shmoverride.conf

clean:
rm -rf debian/changelog.*
Expand Down
3 changes: 3 additions & 0 deletions config/10-gui-daemon-shmoverride.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Adjust PATH to use Xwayland wrapper
[Service]
Environment=PATH=/usr/libexec/qubes/wrappers:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin
1 change: 1 addition & 0 deletions kde-settings-qubes.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ Qubes colorful frames for Breeze plasma theme.
%{_datadir}/kde-settings/kde-profile/default/share/config/klipperrc
%{_datadir}/kde-settings/kde-profile/default/share/config/nepomukserverrc
%{_datadir}/kde-settings/kde-profile/default/share/kde4/services/kcm_nepomuk.desktop
/usr/lib/systemd/user/plasma-kwin_wayland.service.d/10-gui-daemon-shmoverride.conf

%files -n plasma-breeze-qubes
/usr/bin/qubes-generate-color-palette
Expand Down

0 comments on commit 1902f25

Please sign in to comment.