diff --git a/pkgs/desktops/gnome-3/core/gdm/gdm-x-session_path.patch b/pkgs/desktops/gnome-3/core/gdm/gdm-x-session_path.patch deleted file mode 100644 index 84081f4786c..00000000000 --- a/pkgs/desktops/gnome-3/core/gdm/gdm-x-session_path.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/daemon/gdm-x-session.c.orig b/daemon/gdm-x-session.c -index d835b34..86f0d47 100644 ---- a/daemon/gdm-x-session.c.orig -+++ b/daemon/gdm-x-session.c -@@ -240,7 +240,13 @@ spawn_x_server (State *state, - - display_fd_string = g_strdup_printf ("%d", DISPLAY_FILENO); - -- g_ptr_array_add (arguments, X_SERVER); -+ if (g_getenv ("GDM_X_SERVER") != NULL) { -+ g_debug ("using GDM_X_SERVER: %s", g_getenv("GDM_X_SERVER")); -+ g_ptr_array_add (arguments, g_getenv("GDM_X_SERVER")); -+ } else { -+ g_debug ("GDM_X_SERVER not set, using default: %s", X_SERVER); -+ g_ptr_array_add (arguments, X_SERVER); -+ } - - if (vt_string != NULL) { - g_ptr_array_add (arguments, vt_string); diff --git a/pkgs/desktops/gnome-3/core/gdm/src.nix b/pkgs/desktops/gnome-3/core/gdm/src.nix index 5223a346766..8d92167a039 100644 --- a/pkgs/desktops/gnome-3/core/gdm/src.nix +++ b/pkgs/desktops/gnome-3/core/gdm/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "gdm-3.26.0"; + name = "gdm-3.26.2.1"; src = fetchurl { - url = mirror://gnome/sources/gdm/3.26/gdm-3.26.0.tar.xz; - sha256 = "1ng8vkijwrbq8hjzmmi5ai2m4cq3f1g0rbynx5rddgi7n33cmf5g"; + url = mirror://gnome/sources/gdm/3.26/gdm-3.26.2.1.tar.xz; + sha256 = "17ddcb00602c2b426de58bb4b0d99af9de27450a8557dcc5ec850c080d55ad57"; }; }