Merge pull request #31283 from michalrus/per-user-profiles-buildEnv

users-groups module: use `buildEnv` in per-user profiles
This commit is contained in:
Jörg Thalheim 2017-11-25 15:28:58 +00:00 committed by GitHub
commit 3ea493430a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -582,13 +582,15 @@ in {
{ {
environment = { environment = {
etc = mapAttrs' (name: { packages, ... }: { etc = mapAttrs' (name: { packages, ... }: {
name = "per-user-pkgs/${name}"; name = "profiles/per-user/${name}";
value.source = pkgs.symlinkJoin { value.source = pkgs.buildEnv {
name = "per-user-pkgs.${name}"; name = "user-environment";
paths = packages; paths = packages;
inherit (config.environment) pathsToLink extraOutputsToInstall;
inherit (config.system.path) ignoreCollisions postBuild;
}; };
}) (filterAttrs (_: { packages, ... }: packages != []) cfg.users); }) (filterAttrs (_: { packages, ... }: packages != []) cfg.users);
profiles = ["/etc/per-user-pkgs/$LOGNAME"]; profiles = ["/etc/profiles/per-user/$USER"];
}; };
} }
]; ];