diff options
| author | Tor Hedin Brønner <torhedinbronner@gmail.com> | 2018-09-08 07:58:17 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2018-11-30 21:34:47 +0100 |
| commit | 2c8565a3ce84c29372c0875e285c29cc374ee6ce (patch) | |
| tree | 27d214dc6c7f9a96615d3dd827e828dd539d2b1c /pkgs/desktops/gnome-3/core/gdm | |
| parent | a3d6b0a4b1934b82e799b13e47cc3950930b6f97 (diff) | |
| download | nixpkgs-2c8565a3ce84c29372c0875e285c29cc374ee6ce.tar nixpkgs-2c8565a3ce84c29372c0875e285c29cc374ee6ce.tar.gz nixpkgs-2c8565a3ce84c29372c0875e285c29cc374ee6ce.tar.bz2 nixpkgs-2c8565a3ce84c29372c0875e285c29cc374ee6ce.tar.lz nixpkgs-2c8565a3ce84c29372c0875e285c29cc374ee6ce.tar.xz nixpkgs-2c8565a3ce84c29372c0875e285c29cc374ee6ce.tar.zst nixpkgs-2c8565a3ce84c29372c0875e285c29cc374ee6ce.zip | |
nixos/gdm: use XDG_DATA_DIRS to find sessions
Gdm now searches for session files in XDG_DATA_DIRS so we no longer need the sessions_dir.patch.
Diffstat (limited to 'pkgs/desktops/gnome-3/core/gdm')
| -rw-r--r-- | pkgs/desktops/gnome-3/core/gdm/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-3/core/gdm/sessions_dir.patch | 38 |
2 files changed, 0 insertions, 42 deletions
diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix index c419df5093e..691049cf655 100644 --- a/pkgs/desktops/gnome-3/core/gdm/default.nix +++ b/pkgs/desktops/gnome-3/core/gdm/default.nix @@ -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. diff --git a/pkgs/desktops/gnome-3/core/gdm/sessions_dir.patch b/pkgs/desktops/gnome-3/core/gdm/sessions_dir.patch deleted file mode 100644 index cda0468d349..00000000000 --- a/pkgs/desktops/gnome-3/core/gdm/sessions_dir.patch +++ /dev/null @@ -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 |