3
5
Fork 0
mirror of git://git.savannah.gnu.org/guix.git synced 2023-12-14 03:33:07 +01:00
guix/gnu/packages/patches/gdm-remove-hardcoded-xwayland-path.patch
Maxim Cournoyer 97313b9b0c
gnu: gdm: Update to 42.0.
* 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.
2022-09-13 00:20:35 -04:00

28 lines
1 KiB
Diff

Remove check for hardcoded Xwayland path in gdm.
diff --git a/daemon/gdm-local-display-factory.c b/daemon/gdm-local-display-factory.c
index 7de7b99c..065325f4 100644
--- a/daemon/gdm-local-display-factory.c
+++ b/daemon/gdm-local-display-factory.c
@@ -245,9 +245,9 @@ struct GdmDisplayServerConfiguration {
const char *session_type;
} display_server_configuration[] = {
#ifdef ENABLE_WAYLAND_SUPPORT
- { "wayland", GDM_KEY_WAYLAND_ENABLE, "/usr/bin/Xwayland", "wayland" },
+ { "wayland", GDM_KEY_WAYLAND_ENABLE, "", "wayland" },
#endif
- { "xorg", GDM_KEY_XORG_ENABLE, "/usr/bin/Xorg", "x11" },
+ { "xorg", GDM_KEY_XORG_ENABLE, "", "x11" },
{ NULL, NULL, NULL },
};
@@ -269,9 +269,6 @@ display_server_enabled (GdmLocalDisplayFactory *factory,
if (!gdm_settings_direct_get_boolean (key, &enabled) || !enabled)
return FALSE;
- if (!g_file_test (binary, G_FILE_TEST_IS_EXECUTABLE))
- return FALSE;
-
return TRUE;
}