wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-06 21:41:48 +02:00
Code Activity

Factor out the generation of the profile/channel directory

Browse source 
Make sure that all the code paths use the same one, and that the
backwards-compatibility measures are probably in place when needed
This commit is contained in:
Théophane Hufschmitt 2023-03-21 13:37:19 +01:00
parent 82bd9535dd
commit fb67c1a1fb
5 changed files with 40 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/nix-channel/nix-channel.cc
View file

@ -168,12 +168,7 @@ static int main_nix_channel(int argc, char ** argv)
nixDefExpr = settings.useXDGBaseDirectories ? createNixStateDir() + "/defexpr" : home + "/.nix-defexpr";
// Figure out the name of the channels profile.
// For backwards-compatibility, install the root channels under
// a custom location, as these are also used as "global" channeles, and
// their location is hardcoded in a number of places.
profile = getuid() == 0
? settings.nixStateDir + "/profiles/per-user/root/channels"
: profilesDir() + "/channels";
profile = profilesDir() + "/channels";
createDirs(dirOf(profile));
enum {