diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-10-16 11:17:12 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-10-16 11:17:12 +0200 |
| commit | 12441bdf9f09a4d355f927f9b2957a90d5c98822 (patch) | |
| tree | 9a57120c6f99ed0e7abc62e5ced7db816df79a6b /nixos/modules/config | |
| parent | 41abe12bb38266e421e61a1332953a6a0409ea5f (diff) | |
| parent | 22bbaf09fedc7ca9addc59c9b1738fc0b83fe2fd (diff) | |
| download | nixlib-12441bdf9f09a4d355f927f9b2957a90d5c98822.tar nixlib-12441bdf9f09a4d355f927f9b2957a90d5c98822.tar.gz nixlib-12441bdf9f09a4d355f927f9b2957a90d5c98822.tar.bz2 nixlib-12441bdf9f09a4d355f927f9b2957a90d5c98822.tar.lz nixlib-12441bdf9f09a4d355f927f9b2957a90d5c98822.tar.xz nixlib-12441bdf9f09a4d355f927f9b2957a90d5c98822.tar.zst nixlib-12441bdf9f09a4d355f927f9b2957a90d5c98822.zip | |
Merge staging-next into staging
Diffstat (limited to 'nixos/modules/config')
| -rw-r--r-- | nixos/modules/config/pulseaudio.nix | 3 | ||||
| -rw-r--r-- | nixos/modules/config/system-environment.nix | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index 5c3e39302583..b3bc4a451aa0 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -51,8 +51,7 @@ let # that we can disable the autospawn feature in programs that # are built with PulseAudio support (like KDE). clientConf = writeText "client.conf" '' - autospawn=${if nonSystemWide then "yes" else "no"} - ${optionalString nonSystemWide "daemon-binary=${binary}"} + autospawn=no ${cfg.extraClientConf} ''; 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 ])); |