cafkafk/lix
cafkafk/lix
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

nix-channel: Restore the old root channels directory

Browse source
This commit is contained in:
Théophane Hufschmitt 2023-03-20 10:24:48 +01:00
parent 918ca8b3a3
commit 82bd9535dd
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -168,7 +168,13 @@ static int main_nix_channel(int argc, char ** argv)
nixDefExpr = settings.useXDGBaseDirectories ? createNixStateDir() + "/defexpr" : home + "/.nix-defexpr"; nixDefExpr = settings.useXDGBaseDirectories ? createNixStateDir() + "/defexpr" : home + "/.nix-defexpr";
// Figure out the name of the channels profile. // Figure out the name of the channels profile.
profile = profilesDir() + "/channels"; // 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";
createDirs(dirOf(profile));
enum { enum {
cNone, cNone,