diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-10-16 11:15:36 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-10-16 11:15:36 +0200 |
commit | 22bbaf09fedc7ca9addc59c9b1738fc0b83fe2fd (patch) | |
tree | 3892a5a50b64c52e6b4e7b4591c11facb8b4f14a /nixos/modules/config | |
parent | b5697c6954d4b261d354cb6630385fe280f15ef9 (diff) | |
parent | d2c13034fb158bc8d72d42a817f8370ab3940156 (diff) | |
download | nixlib-22bbaf09fedc7ca9addc59c9b1738fc0b83fe2fd.tar nixlib-22bbaf09fedc7ca9addc59c9b1738fc0b83fe2fd.tar.gz nixlib-22bbaf09fedc7ca9addc59c9b1738fc0b83fe2fd.tar.bz2 nixlib-22bbaf09fedc7ca9addc59c9b1738fc0b83fe2fd.tar.lz nixlib-22bbaf09fedc7ca9addc59c9b1738fc0b83fe2fd.tar.xz nixlib-22bbaf09fedc7ca9addc59c9b1738fc0b83fe2fd.tar.zst nixlib-22bbaf09fedc7ca9addc59c9b1738fc0b83fe2fd.zip |
Merge master into staging-next
Diffstat (limited to 'nixos/modules/config')
-rw-r--r-- | nixos/modules/config/system-environment.nix | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/nixos/modules/config/system-environment.nix b/nixos/modules/config/system-environment.nix index 361c3cfc553d..4888740ba3d5 100644 --- a/nixos/modules/config/system-environment.nix +++ b/nixos/modules/config/system-environment.nix @@ -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 ])); |