Skip to content

Add meson option to disable x11 session #92

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
danirabbit merged 2 commits into from
Sep 15, 2025
Merged

Add meson option to disable x11 session #92

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
7518706
Always build wayland session
bobby285271 Sep 14, 2025
df8b371
Add meson option to disable x11 session
bobby285271 Sep 14, 2025
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
9 changes: 5 additions & 4 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,13 @@ if get_option('mimeapps-list')
endif

subdir('session')
subdir('xsessions')

if get_option('x11')
subdir('xsessions')
endif

if get_option('systemd')
subdir('systemd')
endif

if get_option('wayland')
subdir('wayland-sessions')
endif
subdir('wayland-sessions')
4 changes: 2 additions & 2 deletions meson_options.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ option('systemd', type: 'boolean', value: true,
option('systemduserunitdir', type: 'string', value: '',
description : 'Custom directory for systemd user units')

option('wayland', type: 'boolean', value: false,
description: 'Install Wayland session')
option('x11', type: 'boolean', value: true,
description: 'Install X11 session')
54 changes: 27 additions & 27 deletions session/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,39 +1,39 @@
fallback_session = get_option('fallback-session')
if get_option('x11')
fallback_session = get_option('fallback-session')

session_configuration = configuration_data()
session_configuration.set('FALLBACK_SESSION', fallback_session)
session_configuration = configuration_data()
session_configuration.set('FALLBACK_SESSION', fallback_session)

session_components = [
'gala',
session_components = [
'gala',
gsd_components
]

session_configuration.set('SESSION_COMPONENTS', ';'.join(session_components))

pantheon_session = configure_file(
input: 'pantheon.session.in',
output: '@BASENAME@',
configuration: session_configuration,
install_dir: join_paths(datadir, 'gnome-session', 'sessions')
)
endif

wayland_session_components = [
'gala-wayland',
gsd_components
]

session_configuration.set('SESSION_COMPONENTS', ';'.join(session_components))
wayland_session_configuration = configuration_data()
wayland_session_configuration.set('SESSION_COMPONENTS', ';'.join(wayland_session_components))

pantheon_session = configure_file(
input: 'pantheon.session.in',
configure_file(
input: 'pantheon-wayland.session.in',
output: '@BASENAME@',
configuration: session_configuration,
install_dir: join_paths(datadir, 'gnome-session', 'sessions')
configuration: wayland_session_configuration,
install_dir: datadir / 'gnome-session' / 'sessions'
)

if get_option('wayland')
wayland_session_components = [
'gala-wayland',
gsd_components
]

wayland_session_configuration = configuration_data()
wayland_session_configuration.set('SESSION_COMPONENTS', ';'.join(wayland_session_components))

configure_file(
input: 'pantheon-wayland.session.in',
output: '@BASENAME@',
configuration: wayland_session_configuration,
install_dir: datadir / 'gnome-session' / 'sessions'
)
endif

autostartdir = join_paths(get_option('sysconfdir'), 'xdg', 'autostart')

gsd_dir = gsd_dep.get_pkgconfig_variable('prefix')
Expand Down