diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-10-19 20:14:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-19 20:14:36 +0200 |
| commit | c857cf99e16e09aaa9e7a0b53f5514e1ef1d925d (patch) | |
| tree | cffb970cf39f1393eba3ae3192e95f4406814c27 /pkgs/desktops | |
| parent | 6b81005e66f1de9ccad34f2cf795fdb4f4f02942 (diff) | |
| parent | f908bf27305d80fca9b4955b3a758ca5c7ab4626 (diff) | |
| download | nixlib-c857cf99e16e09aaa9e7a0b53f5514e1ef1d925d.tar nixlib-c857cf99e16e09aaa9e7a0b53f5514e1ef1d925d.tar.gz nixlib-c857cf99e16e09aaa9e7a0b53f5514e1ef1d925d.tar.bz2 nixlib-c857cf99e16e09aaa9e7a0b53f5514e1ef1d925d.tar.lz nixlib-c857cf99e16e09aaa9e7a0b53f5514e1ef1d925d.tar.xz nixlib-c857cf99e16e09aaa9e7a0b53f5514e1ef1d925d.tar.zst nixlib-c857cf99e16e09aaa9e7a0b53f5514e1ef1d925d.zip | |
Merge pull request #48517 from hedning/gdm-fix-environement
gnome3.gdm: Always reset the environment for new sessions
Diffstat (limited to 'pkgs/desktops')
| -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"); |