mirror of
https://git.savannah.gnu.org/git/guix.git
synced 2026-04-07 05:30:38 +02:00
1e5cad6911
* gnu/packages/gnome.scm (gdm): Update to 48.0. * gnu/packages/patches/gdm-default-session.patch: Adjust accordingly. * gnu/packages/patches/gdm-remove-hardcoded-xwayland-path.patch: Likewise.
33 lines
1.0 KiB
Diff
33 lines
1.0 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
|
|
@@ -261,11 +261,11 @@ 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
|
|
#ifdef ENABLE_X11_SUPPORT
|
|
- { "xorg", GDM_KEY_XORG_ENABLE, "/usr/bin/Xorg", "x11" },
|
|
+ { "xorg", GDM_KEY_XORG_ENABLE, "", "x11" },
|
|
#endif
|
|
{ NULL, NULL, NULL },
|
|
};
|
|
|
|
@@ -289,11 +289,6 @@ display_server_enabled (GdmLocalDisplayFactory *factory,
|
|
return FALSE;
|
|
#endif
|
|
|
|
-#ifdef ENABLE_X11_SUPPORT
|
|
- if (!g_file_test (binary, G_FILE_TEST_IS_EXECUTABLE))
|
|
- return FALSE;
|
|
-#endif
|
|
-
|
|
return TRUE;
|
|
}
|
|
|