Skip to content

Disable wayland session by default #70

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
marmarek merged 1 commit into from
Sep 17, 2025
Merged

Disable wayland session by default #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 15 additions & 0 deletions rpm_spec/desktop-linux-common.spec.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,13 @@ This package contains the XML files that describe the menu layout for
GNOME and KDE, and the .desktop files that define the names and icons
of "subdirectories" in the menus.

%package wayland
Summary: Configuration to enable Wayland session
Group: User Interface/Desktops

%description wayland
This package enables experimental wayland session support.

%prep
%setup -q

Expand All @@ -61,6 +68,7 @@ make -C doc manpages PYTHON=%{__python3}
%install
make DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} PYTHON=%{__python3} install
make -C doc DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} PYTHON=%{__python3} install
make -C wayland-config DESTDIR=$RPM_BUILD_ROOT install

%post
for i in /usr/share/qubes/icons/*.png ; do
Expand Down Expand Up @@ -116,6 +124,9 @@ fi
/usr/bin/qvm-sync-appmenus
/usr/bin/qvm-appmenus

/usr/lib/sddm/sddm.conf.d/10-qubes-wayland-off.conf
/usr/share/lightdm/lightdm.conf.d/10-qubes-wayland-off.conf

%files -n qubes-menus
%defattr(-,root,root)
%doc qubes-menus/README
Expand All @@ -127,5 +138,9 @@ fi
%config %{_sysconfdir}/xdg/menus/*.menu
%{_datadir}/desktop-directories/*.directory

%files wayland
/usr/lib/sddm/sddm.conf.d/15-qubes-wayland-on.conf
/usr/share/lightdm/lightdm.conf.d/15-qubes-wayland-on.conf

%changelog
@CHANGELOG@
12 changes: 12 additions & 0 deletions wayland-config/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
all:
@true

install:
install -D -m0644 lightdm-10-qubes-wayland-off.conf \
$(DESTDIR)/usr/share/lightdm/lightdm.conf.d/10-qubes-wayland-off.conf
install -D -m0644 lightdm-15-qubes-wayland-on.conf \
$(DESTDIR)/usr/share/lightdm/lightdm.conf.d/15-qubes-wayland-on.conf
install -D -m0644 sddm-10-qubes-wayland-off.conf \
$(DESTDIR)/usr/lib/sddm/sddm.conf.d/10-qubes-wayland-off.conf
install -D -m0644 sddm-15-qubes-wayland-on.conf \
$(DESTDIR)/usr/lib/sddm/sddm.conf.d/15-qubes-wayland-on.conf
3 changes: 3 additions & 0 deletions wayland-config/lightdm-10-qubes-wayland-off.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[LightDM]
# exclude wayland sessions by default as wayland is still experimental in qubes
sessions-directory=/usr/share/lightdm/sessions:/usr/share/xsessions
3 changes: 3 additions & 0 deletions wayland-config/lightdm-15-qubes-wayland-on.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[LightDM]
# re-enable wayland sessions at explicit request
sessions-directory=/usr/share/lightdm/sessions:/usr/share/xsessions:/usr/share/wayland-sessions
2 changes: 2 additions & 0 deletions wayland-config/sddm-10-qubes-wayland-off.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[Wayland]
SessionDir=
2 changes: 2 additions & 0 deletions wayland-config/sddm-15-qubes-wayland-on.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[Wayland]
SessionDir=/usr/local/share/wayland-sessions,/usr/share/wayland-sessions