diff options
author | worldofpeace <worldofpeace@protonmail.ch> | 2019-10-05 15:04:31 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-05 15:04:31 +0000 |
commit | 60ddfac0c65ce7cdd54a36c4adf10daa5a50f773 (patch) | |
tree | b63570fe75407517284e9832083c76fc5d3bb233 /nixos/modules | |
parent | fcfc145158f2d7190f90fb96d914b020713ff498 (diff) | |
parent | 57481b7a1c1e8c7c835009e1c7ad89d2f7b3d898 (diff) | |
download | nixpkgs-60ddfac0c65ce7cdd54a36c4adf10daa5a50f773.tar nixpkgs-60ddfac0c65ce7cdd54a36c4adf10daa5a50f773.tar.gz nixpkgs-60ddfac0c65ce7cdd54a36c4adf10daa5a50f773.tar.bz2 nixpkgs-60ddfac0c65ce7cdd54a36c4adf10daa5a50f773.tar.lz nixpkgs-60ddfac0c65ce7cdd54a36c4adf10daa5a50f773.tar.xz nixpkgs-60ddfac0c65ce7cdd54a36c4adf10daa5a50f773.tar.zst nixpkgs-60ddfac0c65ce7cdd54a36c4adf10daa5a50f773.zip |
Merge pull request #70465 from worldofpeace/pam-home
nixos/system-environment: use pam syntax for home variable
Diffstat (limited to 'nixos/modules')
-rw-r--r-- | nixos/modules/config/system-environment.nix | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/nixos/modules/config/system-environment.nix b/nixos/modules/config/system-environment.nix index 4b663ebf85a..361c3cfc553 100644 --- a/nixos/modules/config/system-environment.nix +++ b/nixos/modules/config/system-environment.nix @@ -78,9 +78,7 @@ in # We're trying to use the same syntax for PAM variables and env variables. # That means we need to map the env variables that people might use to their # equivalent PAM variable. - # Note: PAM_USER is a PAM_ITEM, HOME is an environment variable, they have - # different syntax. - replaceEnvVars = replaceStrings ["$HOME" "$USER"] ["\${HOME}" "@{PAM_USER}"]; + replaceEnvVars = replaceStrings ["$HOME" "$USER"] ["@{HOME}" "@{PAM_USER}"]; pamVariable = n: v: ''${n} DEFAULT="${concatStringsSep ":" (map replaceEnvVars (toList v))}"''; |