diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-05-02 04:16:27 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2018-05-06 22:20:56 +0200 |
| commit | 300af6677760944a3c27f7bf33a1366c380c3317 (patch) | |
| tree | ffda3ecaf33be6fe2cd177945ca5fe260a40babb | |
| parent | 127de7480e8dfc6c29aae06eb4669bb08c41763e (diff) | |
| download | nixlib-300af6677760944a3c27f7bf33a1366c380c3317.tar nixlib-300af6677760944a3c27f7bf33a1366c380c3317.tar.gz nixlib-300af6677760944a3c27f7bf33a1366c380c3317.tar.bz2 nixlib-300af6677760944a3c27f7bf33a1366c380c3317.tar.lz nixlib-300af6677760944a3c27f7bf33a1366c380c3317.tar.xz nixlib-300af6677760944a3c27f7bf33a1366c380c3317.tar.zst nixlib-300af6677760944a3c27f7bf33a1366c380c3317.zip | |
gnome3.gdm: fix session chooser
We are patching GDM to respect GDM_SESSIONS_DIR environment variable, which we are setting in the GDM module. Previously, we only took care of a single code path, the one that handled session start-up; missing the one obtaining the list of sessions. This commit patches the second code path, and also whitelists the GDM_SESSIONS_DIR so that it can be passed to the greeter. Fixes #34101
| -rw-r--r-- | pkgs/desktops/gnome-3/core/gdm/sessions_dir.patch | 39 |
1 files changed, 34 insertions, 5 deletions
diff --git a/pkgs/desktops/gnome-3/core/gdm/sessions_dir.patch b/pkgs/desktops/gnome-3/core/gdm/sessions_dir.patch index bbc803d49c19..7722e2550bdb 100644 --- a/pkgs/desktops/gnome-3/core/gdm/sessions_dir.patch +++ b/pkgs/desktops/gnome-3/core/gdm/sessions_dir.patch @@ -1,8 +1,17 @@ -diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c -index ff3a1acb..b8705d8f 100644 +--- a/daemon/gdm-launch-environment.c ++++ b/daemon/gdm-launch-environment.c +@@ -126,7 +126,7 @@ + "LC_COLLATE", "LC_MONETARY", "LC_MESSAGES", "LC_PAPER", + "LC_NAME", "LC_ADDRESS", "LC_TELEPHONE", "LC_MEASUREMENT", + "LC_IDENTIFICATION", "LC_ALL", "WINDOWPATH", "XCURSOR_PATH", +- "XDG_CONFIG_DIRS", NULL ++ "XDG_CONFIG_DIRS", "GDM_SESSIONS_DIR", NULL + }; + char *system_data_dirs; + int i; --- a/daemon/gdm-session.c +++ b/daemon/gdm-session.c -@@ -344,6 +344,7 @@ get_system_session_dirs (GdmSession *self) +@@ -345,12 +345,17 @@ char **search_dirs; static const char *x_search_dirs[] = { @@ -10,8 +19,7 @@ index ff3a1acb..b8705d8f 100644 "/etc/X11/sessions/", DMCONFDIR "/Sessions/", DATADIR "/gdm/BuiltInSessions/", -@@ -351,6 +352,10 @@ get_system_session_dirs (GdmSession *self) - NULL + DATADIR "/xsessions/", }; + if (getenv("GDM_SESSIONS_DIR") != NULL) { @@ -21,3 +29,24 @@ index ff3a1acb..b8705d8f 100644 static const char *wayland_search_dir = DATADIR "/wayland-sessions/"; search_array = g_array_new (TRUE, TRUE, sizeof (char *)); +--- a/libgdm/gdm-sessions.c ++++ b/libgdm/gdm-sessions.c +@@ -217,6 +217,7 @@ + { + int i; + const char *xorg_search_dirs[] = { ++ "/var/empty/", + "/etc/X11/sessions/", + DMCONFDIR "/Sessions/", + DATADIR "/gdm/BuiltInSessions/", +@@ -224,6 +225,10 @@ + NULL + }; + ++ if (g_getenv("GDM_SESSIONS_DIR") != NULL) { ++ xorg_search_dirs[0] = g_getenv("GDM_SESSIONS_DIR"); ++ }; ++ + #ifdef ENABLE_WAYLAND_SUPPORT + const char *wayland_search_dirs[] = { + DATADIR "/wayland-sessions/", |