diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-10-20 09:40:09 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-10-20 09:40:09 +0200 |
| commit | ca6ee8f519733e1f45b7598d995245dd687f535c (patch) | |
| tree | 3c84d14a7da3b890b5f3be62ab13e6eae2805695 /pkgs/desktops/gnome-3/core/gdm | |
| parent | 4c774f24acf2b674b99f70690f73a67c095f1968 (diff) | |
| parent | ceb0ce849fe01fcbc221e3b978a0744bf3735752 (diff) | |
| download | nixlib-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')
| -rw-r--r-- | pkgs/desktops/gnome-3/core/gdm/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-3/core/gdm/reset-environment.patch | 20 |
2 files changed, 24 insertions, 0 deletions
diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix index 388fa89acaab..761f6b34ec6b 100644 --- a/pkgs/desktops/gnome-3/core/gdm/default.nix +++ b/pkgs/desktops/gnome-3/core/gdm/default.nix @@ -58,6 +58,10 @@ stdenv.mkDerivation rec { # Forwards certain environment variables to the gdm-x-session child process # to ensure that the above two patches actually work. ./gdm-session-worker_forward-vars.patch + + # Set up the environment properly when launching sessions + # https://github.com/NixOS/nixpkgs/issues/48255 + ./reset-environment.patch ]; installFlags = [ 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"); |