From db4681a4c17d282a661552f2f57e5c453d02e414 Mon Sep 17 00:00:00 2001 From: Josselin Poiret Date: Sat, 2 Oct 2021 16:51:34 +0000 Subject: services: gdm: Add Wayland support. * gnu/packages/patches/gdm-wayland-session-wrapper-from-env.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/gnome.scm (gdm): Use it. * gnu/services/xorg.scm ()[wayland-session]: New field. (gdm-wayland-session-wrapper): New procedure. (gdm-configuration-file): Point to this new procedure. * doc/guix.texi (X Window): Update it. Signed-off-by: Mathieu Othacehe --- gnu/packages/gnome.scm | 3 +- .../gdm-wayland-session-wrapper-from-env.patch | 35 ++++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/gdm-wayland-session-wrapper-from-env.patch (limited to 'gnu/packages') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f0a8a4265d..c705d68943 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8150,7 +8150,8 @@ library.") (search-patches "gdm-default-session.patch" "gdm-elogind-support.patch" - "gdm-remove-hardcoded-xwayland-path.patch")))) + "gdm-remove-hardcoded-xwayland-path.patch" + "gdm-wayland-session-wrapper-from-env.patch")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t diff --git a/gnu/packages/patches/gdm-wayland-session-wrapper-from-env.patch b/gnu/packages/patches/gdm-wayland-session-wrapper-from-env.patch new file mode 100644 index 0000000000..28d4b5b9fa --- /dev/null +++ b/gnu/packages/patches/gdm-wayland-session-wrapper-from-env.patch @@ -0,0 +1,35 @@ +Get wayland-session wrapper from environment. + +--- + daemon/gdm-session.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c +index 4e303e70..1deca4e9 100644 +--- a/daemon/gdm-session.c ++++ b/daemon/gdm-session.c +@@ -2888,8 +2888,9 @@ gdm_session_start_session (GdmSession *self, + allow_remote_connections? "--allow-remote-connections " : "", + command); + } else { +- program = g_strdup_printf (LIBEXECDIR "/gdm-wayland-session %s\"%s\"", ++ program = g_strdup_printf (LIBEXECDIR "/gdm-wayland-session %s\"%s %s\"", + register_session ? "--register-session " : "", ++ g_getenv ("GDM_WAYLAND_SESSION"), + command); + } + } else if (run_xsession_script) { +@@ -2906,8 +2907,9 @@ gdm_session_start_session (GdmSession *self, + register_session ? "--register-session " : "", + self->selected_program); + } else { +- program = g_strdup_printf (LIBEXECDIR "/gdm-wayland-session %s\"%s\"", ++ program = g_strdup_printf (LIBEXECDIR "/gdm-wayland-session %s\"%s %s\"", + register_session ? "--register-session " : "", ++ g_getenv ("GDM_WAYLAND_SESSION"), + self->selected_program); + } + } else { +-- +2.33.0 + -- cgit v1.2.3