maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nix-env: Create ~/.nix-defexpr automatically

Browse source 
(cherry picked from commit c9159f86cc9a2fc07e2ab1217c2d8a8824123df4)
This commit is contained in:
Eelco Dolstra 2019-10-09 19:50:46 +02:00
parent f66108f738
commit 0fb4744467
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
3 changed files with 12 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -193,12 +193,6 @@ static void loadDerivations(EvalState & state, Path nixExprPath,
}
static Path getDefNixExprPath()
{
return getHome() + "/.nix-defexpr";
}
static long getPriority(EvalState & state, DrvInfo & drv)
{
return drv.queryMetaInt("priority", 0);
@ -1330,9 +1324,20 @@ static int _main(int argc, char * * argv)
Globals globals;
globals.instSource.type = srcUnknown;
globals.instSource.nixExprPath = getDefNixExprPath();
globals.instSource.nixExprPath = getHome() + "/.nix-defexpr";
globals.instSource.systemFilter = "*";
if (!pathExists(globals.instSource.nixExprPath)) {
createDirs(globals.instSource.nixExprPath);
replaceSymlink(
fmt("%s/profiles/per-user/%s/channels", settings.nixStateDir, getUserName()),
globals.instSource.nixExprPath + "/channels");
if (getuid() != 0)
replaceSymlink(
fmt("%s/profiles/per-user/root/channels", settings.nixStateDir),
globals.instSource.nixExprPath + "/channels_root");
}
globals.dryRun = false;
globals.preserveInstalled = false;
globals.removeAll = false;