lix-project/lix
18
48
Fork 24
Code Issues 333 Code Review (Gerrit) Projects 1 Releases Wiki Activity

nix-env: Ignore failures creating ~/.nix-profile and ~/.nix-defexpr

Browse source 
https://hydra.nixos.org/build/102803093
This commit is contained in:
Eelco Dolstra 2019-10-10 09:14:05 +02:00
parent bda64a2b0f
commit c3aaf3b8da
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
1 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/nix-env/nix-env.cc
View file

@ -1325,14 +1325,16 @@ static int _main(int argc, char * * argv)
globals.instSource.systemFilter = "*"; globals.instSource.systemFilter = "*";
if (!pathExists(globals.instSource.nixExprPath)) { if (!pathExists(globals.instSource.nixExprPath)) {
createDirs(globals.instSource.nixExprPath); try {
replaceSymlink( createDirs(globals.instSource.nixExprPath);
fmt("%s/profiles/per-user/%s/channels", settings.nixStateDir, getUserName()),
globals.instSource.nixExprPath + "/channels");
if (getuid() != 0)
replaceSymlink( replaceSymlink(
fmt("%s/profiles/per-user/root/channels", settings.nixStateDir), fmt("%s/profiles/per-user/%s/channels", settings.nixStateDir, getUserName()),
globals.instSource.nixExprPath + "/channels_root"); globals.instSource.nixExprPath + "/channels");
if (getuid() != 0)
replaceSymlink(
fmt("%s/profiles/per-user/root/channels", settings.nixStateDir),
globals.instSource.nixExprPath + "/channels_root");
} catch (Error &) { }
} }
globals.dryRun = false; globals.dryRun = false;
@ -1427,14 +1429,18 @@ static int _main(int argc, char * * argv)
if (globals.profile == "") { if (globals.profile == "") {
Path profileLink = getHome() + "/.nix-profile"; Path profileLink = getHome() + "/.nix-profile";
if (!pathExists(profileLink)) { try {
replaceSymlink( if (!pathExists(profileLink)) {
getuid() == 0 replaceSymlink(
? settings.nixStateDir + "/profiles/default" getuid() == 0
: fmt("%s/profiles/per-user/%s/profile", settings.nixStateDir, getUserName()), ? settings.nixStateDir + "/profiles/default"
profileLink); : fmt("%s/profiles/per-user/%s/profile", settings.nixStateDir, getUserName()),
profileLink);
}
globals.profile = absPath(readLink(profileLink), dirOf(profileLink));
} catch (Error &) {
globals.profile = profileLink;
} }
globals.profile = absPath(readLink(profileLink), dirOf(profileLink));
} }
op(globals, opFlags, opArgs); op(globals, opFlags, opArgs);