diff options
| author | Michael Peyton Jones <me@michaelpj.com> | 2019-09-30 21:01:33 +0100 |
|---|---|---|
| committer | worldofpeace <worldofpeace@protonmail.ch> | 2019-10-01 21:19:04 -0400 |
| commit | d8b9742deb3994018d94fc550e777ea684baca6e (patch) | |
| tree | bb8cb6a4f85f04b8986999fcbf2326b5e4cfa317 /nixos/modules/config | |
| parent | 9d61ddaf822798d0e02092e471060b5ba672f2ab (diff) | |
| download | nixlib-d8b9742deb3994018d94fc550e777ea684baca6e.tar nixlib-d8b9742deb3994018d94fc550e777ea684baca6e.tar.gz nixlib-d8b9742deb3994018d94fc550e777ea684baca6e.tar.bz2 nixlib-d8b9742deb3994018d94fc550e777ea684baca6e.tar.lz nixlib-d8b9742deb3994018d94fc550e777ea684baca6e.tar.xz nixlib-d8b9742deb3994018d94fc550e777ea684baca6e.tar.zst nixlib-d8b9742deb3994018d94fc550e777ea684baca6e.zip | |
nixos/system-environment: fix syntax for environment variables
`@` synax is for `PAM_ITEM`s, `HOME` needs to use `$`.
Diffstat (limited to 'nixos/modules/config')
| -rw-r--r-- | nixos/modules/config/system-environment.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/nixos/modules/config/system-environment.nix b/nixos/modules/config/system-environment.nix index e934e79e7e8e..4b663ebf85a4 100644 --- a/nixos/modules/config/system-environment.nix +++ b/nixos/modules/config/system-environment.nix @@ -78,7 +78,9 @@ 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. - replaceEnvVars = replaceStrings ["$HOME" "$USER"] ["@{HOME}" "@{PAM_USER}"] + # Note: PAM_USER is a PAM_ITEM, HOME is an environment variable, they have + # different syntax. + replaceEnvVars = replaceStrings ["$HOME" "$USER"] ["\${HOME}" "@{PAM_USER}"]; pamVariable = n: v: ''${n} DEFAULT="${concatStringsSep ":" (map replaceEnvVars (toList v))}"''; |