summary refs log tree commit diff
path: root/pkgs/desktops/gnome-3/core/gdm/reset-environment.patch
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2018-10-20 09:40:09 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2018-10-20 09:40:09 +0200
commitca6ee8f519733e1f45b7598d995245dd687f535c (patch)
tree3c84d14a7da3b890b5f3be62ab13e6eae2805695 /pkgs/desktops/gnome-3/core/gdm/reset-environment.patch
parent4c774f24acf2b674b99f70690f73a67c095f1968 (diff)
parentceb0ce849fe01fcbc221e3b978a0744bf3735752 (diff)
downloadnixlib-ca6ee8f519733e1f45b7598d995245dd687f535c.tar
nixlib-ca6ee8f519733e1f45b7598d995245dd687f535c.tar.gz
nixlib-ca6ee8f519733e1f45b7598d995245dd687f535c.tar.bz2
nixlib-ca6ee8f519733e1f45b7598d995245dd687f535c.tar.lz
nixlib-ca6ee8f519733e1f45b7598d995245dd687f535c.tar.xz
nixlib-ca6ee8f519733e1f45b7598d995245dd687f535c.tar.zst
nixlib-ca6ee8f519733e1f45b7598d995245dd687f535c.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/desktops/gnome-3/core/gdm/reset-environment.patch')
-rw-r--r--pkgs/desktops/gnome-3/core/gdm/reset-environment.patch20
1 files changed, 20 insertions, 0 deletions
diff --git a/pkgs/desktops/gnome-3/core/gdm/reset-environment.patch b/pkgs/desktops/gnome-3/core/gdm/reset-environment.patch
new file mode 100644
index 000000000000..61defd9c4bc2
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/gdm/reset-environment.patch
@@ -0,0 +1,20 @@
+--- a/daemon/gdm-wayland-session.c
++++ b/daemon/gdm-wayland-session.c
+@@ -285,6 +285,7 @@ spawn_session (State        *state,
+                                                     "WAYLAND_DISPLAY",
+                                                     "WAYLAND_SOCKET",
+                                                     "GNOME_SHELL_SESSION_MODE",
++                                                    "__NIXOS_SET_ENVIRONMENT_DONE",
+                                                     NULL };
+ 
+         g_debug ("Running wayland session");
+--- a/daemon/gdm-x-session.c
++++ b/daemon/gdm-x-session.c
+@@ -610,6 +610,7 @@ spawn_session (State        *state,
+                                                      "WAYLAND_DISPLAY",
+                                                      "WAYLAND_SOCKET",
+                                                      "GNOME_SHELL_SESSION_MODE",
++                                                     "__NIXOS_SET_ENVIRONMENT_DONE",
+                                                      NULL };
+ 
+         g_debug ("Running X session");