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

nix-build/nix-shell: Eliminate call to nix-instantiate / nix-store

Browse source 
Note that this removes the need for a derivation symlink, so the
--drv-path and --add-drv-link flags now do nothing.
This commit is contained in:
Eelco Dolstra 2017-07-25 15:09:06 +02:00
parent c94f3d5575
commit 4c9ff89c26
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
6 changed files with 449 additions and 511 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -17,13 +17,6 @@
using namespace nix;
static Expr * parseStdin(EvalState & state)
{
//Activity act(*logger, lvlTalkative, format("parsing standard input"));
return state.parseExprFromString(drainFD(0), absPath("."));
}
static Path gcRoot;
static int rootNr = 0;
static bool indirectRoot = false;
@ -166,7 +159,7 @@ int main(int argc, char * * argv)
Bindings & autoArgs(*evalAutoArgs(state, autoArgs_));
if (attrPaths.empty()) attrPaths.push_back("");
if (attrPaths.empty()) attrPaths = {""};
if (findFile) {
for (auto & i : files) {
@ -178,7 +171,7 @@ int main(int argc, char * * argv)
}
if (readStdin) {
Expr * e = parseStdin(state);
Expr * e = state.parseStdin();
processExpr(state, attrPaths, parseOnly, strict, autoArgs,
evalOnly, outputKind, xmlOutputSourceLocation, e);
} else if (files.empty() && !fromArgs)