JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nixos/gdm: use XDG_DATA_DIRS to find sessions

Browse Source 
Gdm now searches for session files in XDG_DATA_DIRS so we no longer need the
sessions_dir.patch.
This commit is contained in:
Tor Hedin Brønner 2018-09-08 07:58:17 +02:00 committed by Jan Tojnar
parent a3d6b0a4b1
commit 2c8565a3ce
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
3 changed files with 1 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/x11/display-managers/gdm.nix
View File

@ -116,7 +116,7 @@ in
environment = {
GDM_X_SERVER_EXTRA_ARGS = toString
(filter (arg: arg != "-terminate") cfg.xserverArgs);
GDM_SESSIONS_DIR = "${cfg.session.desktops}/share/xsessions";
XDG_DATA_DIRS = "${cfg.session.desktops}/share/";
# Find the mouse
XCURSOR_PATH = "~/.icons:${pkgs.gnome3.adwaita-icon-theme}/share/icons";
} // optionalAttrs (xSessionWrapper != null) {

4
pkgs/desktops/gnome-3/core/gdm/default.nix
View File

@ -46,10 +46,6 @@ stdenv.mkDerivation rec {
# The following patches implement certain environment variables in GDM which are set by
# the gdm configuration module (nixos/modules/services/x11/display-managers/gdm.nix).
# Look for session definition files in the directory specified by GDM_SESSIONS_DIR.
./sessions_dir.patch
# Allow specifying X server arguments with GDM_X_SERVER_EXTRA_ARGS.
./gdm-x-session_extra_args.patch
# Allow specifying a wrapper for running the session command.

38
pkgs/desktops/gnome-3/core/gdm/sessions_dir.patch
View File

@ -1,38 +0,0 @@
--- a/daemon/gdm-launch-environment.c
+++ b/daemon/gdm-launch-environment.c
@@ -143,6 +143,7 @@
"WINDOWPATH",
"XCURSOR_PATH",
"XDG_CONFIG_DIRS",
+ "GDM_SESSIONS_DIR",
NULL
};
char *system_data_dirs;
--- a/daemon/gdm-session.c
+++ b/daemon/gdm-session.c
@@ -364,6 +364,11 @@
g_array_append_val (search_array, dir);
}
+ if (getenv("GDM_SESSIONS_DIR") != NULL) {
+ gchar *gdm_sessions_dir = g_getenv("GDM_SESSIONS_DIR");
+ g_array_append_val (search_array, gdm_sessions_dir);
+ };
+
g_array_append_vals (search_array, x_search_dirs, G_N_ELEMENTS (x_search_dirs));
#ifdef ENABLE_WAYLAND_SUPPORT
--- a/libgdm/gdm-sessions.c
+++ b/libgdm/gdm-sessions.c
@@ -236,6 +236,11 @@
g_array_append_val (xorg_search_array, session_dir);
}
+ if (g_getenv("GDM_SESSIONS_DIR") != NULL) {
+ gchar *gdm_sessions_dir = g_getenv("GDM_SESSIONS_DIR");
+ g_array_append_val (xorg_search_array, gdm_sessions_dir);
+ };
+
g_array_append_vals (xorg_search_array, xorg_search_dirs, G_N_ELEMENTS (xorg_search_dirs));
#ifdef ENABLE_WAYLAND_SUPPORT