diff options
| author | Michal Rus <m@michalrus.com> | 2017-11-05 17:51:18 +0100 |
|---|---|---|
| committer | Michal Rus <m@michalrus.com> | 2017-11-05 17:56:31 +0100 |
| commit | 55344df0893d008c709ae7036df5145df857ce0a (patch) | |
| tree | 1508a4edfa12144bf5aa79bca821c6663f7a1813 /nixos/modules/config | |
| parent | d9024786f2a5e67f1a03be162647ef2e0202c64a (diff) | |
| download | nixlib-55344df0893d008c709ae7036df5145df857ce0a.tar nixlib-55344df0893d008c709ae7036df5145df857ce0a.tar.gz nixlib-55344df0893d008c709ae7036df5145df857ce0a.tar.bz2 nixlib-55344df0893d008c709ae7036df5145df857ce0a.tar.lz nixlib-55344df0893d008c709ae7036df5145df857ce0a.tar.xz nixlib-55344df0893d008c709ae7036df5145df857ce0a.tar.zst nixlib-55344df0893d008c709ae7036df5145df857ce0a.zip | |
users-groups module: use `buildEnv` in per-user profiles
Resolves #31253
Diffstat (limited to 'nixos/modules/config')
| -rw-r--r-- | nixos/modules/config/users-groups.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index a4715175cc95..c1102d558101 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -582,13 +582,15 @@ in { { environment = { etc = mapAttrs' (name: { packages, ... }: { - name = "per-user-pkgs/${name}"; - value.source = pkgs.symlinkJoin { - name = "per-user-pkgs.${name}"; + name = "profiles/per-user/${name}"; + value.source = pkgs.buildEnv { + name = "user-environment"; paths = packages; + inherit (config.environment) pathsToLink extraOutputsToInstall; + inherit (config.system.path) ignoreCollisions postBuild; }; }) (filterAttrs (_: { packages, ... }: packages != []) cfg.users); - profiles = ["/etc/per-user-pkgs/$LOGNAME"]; + profiles = ["/etc/profiles/per-user/$USER"]; }; } ]; |