diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-11-25 15:28:58 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-25 15:28:58 +0000 |
| commit | 3ea493430ad0f52b2b60da5f82aac793b8819c9c (patch) | |
| tree | a9ac1acf6fbc2200cf34b7bc2b9963af57af8350 /nixos/modules/config | |
| parent | bfaf22a9dfe679293718bbacb3a2a00678a705c4 (diff) | |
| parent | 55344df0893d008c709ae7036df5145df857ce0a (diff) | |
| download | nixlib-3ea493430ad0f52b2b60da5f82aac793b8819c9c.tar nixlib-3ea493430ad0f52b2b60da5f82aac793b8819c9c.tar.gz nixlib-3ea493430ad0f52b2b60da5f82aac793b8819c9c.tar.bz2 nixlib-3ea493430ad0f52b2b60da5f82aac793b8819c9c.tar.lz nixlib-3ea493430ad0f52b2b60da5f82aac793b8819c9c.tar.xz nixlib-3ea493430ad0f52b2b60da5f82aac793b8819c9c.tar.zst nixlib-3ea493430ad0f52b2b60da5f82aac793b8819c9c.zip | |
Merge pull request #31283 from michalrus/per-user-profiles-buildEnv
users-groups module: use `buildEnv` in per-user profiles
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"]; }; } ]; |