picnoir/Nix
1
0
Fork 0
Code Issues Pull requests 1 Releases Wiki Activity

Revert to copyStore = true for nix-instantiate and nix-env

Browse source
This commit is contained in:
Naïm Favier 2022-08-23 14:40:27 +02:00
parent 4c2ff4a0f4
commit ff0b5a778c
No known key found for this signature in database
GPG key ID: 95AFCE8211908325
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -947,7 +947,7 @@ static void queryJSON(Globals & globals, std::vector<DrvInfo> & elems, bool prin
placeholder.write(nullptr);
} else {
PathSet context;
printValueAsJSON(*globals.state, true, *v, noPos, placeholder, context, false);
printValueAsJSON(*globals.state, true, *v, noPos, placeholder, context);
}
}
}

2
src/nix-instantiate/nix-instantiate.cc
View file

@ -53,7 +53,7 @@ void processExpr(EvalState & state, const Strings & attrPaths,
if (output == okXML)
printValueAsXML(state, strict, location, vRes, std::cout, context, noPos);
else if (output == okJSON) {
printValueAsJSON(state, strict, vRes, v.determinePos(noPos), std::cout, context, false);
printValueAsJSON(state, strict, vRes, v.determinePos(noPos), std::cout, context);
std::cout << std::endl;
} else {
if (strict) state.forceValueDeep(vRes);