Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: dbb72303b1ff
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 837cc0767dab
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 6, 2019

  1. gnome3.gnome-session: always run /etc/set-environment on startup 

    gnomes-session sources its environment from a login shell. But if the systemd
user environment already contains `__NIXOS_SET_ENVIRONMENT_DONE` the environment
setup won't happen correctly. Simply unset this variable to ensure a fresh
environment.

This was previously handled by a GDM patch, but it no longer works reliably with
gnome-sessions systemd session.

We still need the GDM patch to handle running other sessions (eg. plasma).

See #48255 for more info on the
underlying issue.
    @hedning
    hedning committed Oct 6, 2019
    Copy the full SHA
    a436602 View commit details

Commits on Oct 7, 2019

  1. Merge pull request #70501 from hedning/fix-gnome-session-env-setup 

    gnome3.gnome-session: always run /etc/set-environment on startup
    @worldofpeace
    worldofpeace authored Oct 7, 2019
    Copy the full SHA
    837cc07 View commit details
Showing with 3 additions and 1 deletion.
  1. +3 −1 pkgs/desktops/gnome-3/core/gnome-session/fix-paths.patch
4 changes: 3 additions & 1 deletion pkgs/desktops/gnome-3/core/gnome-session/fix-paths.patch
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/gnome-session/gnome-session.in
+++ b/gnome-session/gnome-session.in
@@ -3,11 +3,11 @@
@@ -3,11 +3,13 @@
if [ "x$XDG_SESSION_TYPE" = "xwayland" ] &&
[ "x$XDG_SESSION_CLASS" != "xgreeter" ] &&
[ -n "$SHELL" ] &&
@@ -12,6 +12,8 @@
+ ! (echo "$SHELL" | @grep@ -q "nologin"); then
if [ "$1" != '-l' ]; then
- exec bash -c "exec -l '$SHELL' -c '$0 -l $*'"
+ # Make sure the shell actually sets up the environment
+ unset __NIXOS_SET_ENVIRONMENT_DONE
+ exec @bash@ -c "exec -l '$SHELL' -c '$0 -l $*'"
else
shift