mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-25 22:08:16 -05:00
97313b9b0c
* gnu/packages/gnome.scm (gdm): Update to 42.0. [inputs]: Add libgudev. * gnu/packages/patches/gdm-default-session.patch: Rebase patch. * gnu/packages/patches/gdm-elogind-support.patch: Likewise. * gnu/packages/patches/gdm-pass-gdk-pixbuf-loader-env.patch: Likewise. * gnu/packages/patches/gdm-remove-hardcoded-xwayland-path.patch: Likewise. * gnu/packages/patches/gdm-wayland-session-wrapper-from-env.patch: Likewise.
28 lines
1.9 KiB
Diff
28 lines
1.9 KiB
Diff
Get wayland-session wrapper from environment.
|
|
|
|
diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c
|
|
index 3b83fcd3..e60e6a57 100644
|
|
--- a/daemon/gdm-session.c
|
|
+++ b/daemon/gdm-session.c
|
|
@@ -2933,8 +2933,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) {
|
|
@@ -2965,8 +2966,9 @@ gdm_session_start_session (GdmSession *self,
|
|
register_session ? "--register-session " : "",
|
|
self->selected_program);
|
|
} else {
|
|
- program = g_strdup_printf (LIBEXECDIR "/gdm-wayland-session %s\"dbus-run-session -- %s\"",
|
|
+ program = g_strdup_printf (LIBEXECDIR "/gdm-wayland-session %s\"dbus-run-session -- %s %s\"",
|
|
register_session ? "--register-session " : "",
|
|
+ g_getenv ("GDM_WAYLAND_SESSION"),
|
|
self->selected_program);
|
|
}
|
|
} else {
|