mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-16 15:58:36 +00:00
Code Issues Wiki Activity

environment.profiles: fix order of profiles

Browse source 
This change is needed because the order of profiles correlate to the
order in PATH, therefore "/etc/profiles/per-user/$USER" always appeared
after the system packages directories.
This commit is contained in:
Tobias Happ 2019-08-10 10:28:12 +02:00
parent 6eabfe010c
commit 33c834f2fb
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
nixos/modules/config/users-groups.nix
View file

@ -564,7 +564,10 @@ in {
}; };
}) (filterAttrs (_: u: u.packages != []) cfg.users)); }) (filterAttrs (_: u: u.packages != []) cfg.users));
environment.profiles = [ "/etc/profiles/per-user/$USER" ]; environment.profiles = [
"$HOME/.nix-profile"
"/etc/profiles/per-user/$USER"
];
assertions = [ assertions = [
{ assertion = !cfg.enforceIdUniqueness || (uidsAreUnique && gidsAreUnique); { assertion = !cfg.enforceIdUniqueness || (uidsAreUnique && gidsAreUnique);

5
nixos/modules/programs/environment.nix
View file

@ -23,9 +23,8 @@ in
XCURSOR_PATH = [ "$HOME/.icons" ]; XCURSOR_PATH = [ "$HOME/.icons" ];
}; };
environment.profiles = environment.profiles = mkAfter
[ "$HOME/.nix-profile" [ "/nix/var/nix/profiles/default"
"/nix/var/nix/profiles/default"
"/run/current-system/sw" "/run/current-system/sw"
]; ];