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: 81d15948cc19
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2c7f0f06b79a
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Oct 15, 2019

  1. nixos/system-environment: prepend wrapperDir to PATH (#70430) 

    This fixes user environment setup for sessions which doesn't successfully go
through a shell init.

Note we don't go through `sessionVariables` as we want the wrappers to have
highest priority. It would also cause wrapperDir to occur twice when in shell
sessions, as shells use `sessionVariables` too while prepending wrapperDir in a
custom snippet.

In particular logging in and out of gnome-shell could result in a broken path
without this fix.
    @hedning
    hedning authored Oct 15, 2019
    Copy the full SHA
    2c7f0f0 View commit details
Showing with 7 additions and 0 deletions.
  1. +7 −0 nixos/modules/config/system-environment.nix
7 changes: 7 additions & 0 deletions nixos/modules/config/system-environment.nix
View file
Original file line number Diff line number Diff line change
@@ -88,6 +88,13 @@ in
(mapAttrsToList pamVariable
(zipAttrsWith (n: concatLists)
[
# Make sure security wrappers are prioritized without polluting
# shell environments with an extra entry. Sessions which depend on
# pam for its environment will otherwise have eg. broken sudo. In
# particular Gnome Shell sometimes fails to source a proper
# environment from a shell.
{ PATH = [ config.security.wrapperDir ]; }

(mapAttrs (n: toList) cfg.sessionVariables)
suffixedVariables
]));