From 9638f3f3930bffab8a547ec59502ae72e203d9ff Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 23 Aug 2006 16:20:14 +0000 Subject: * Pass the autoArgs to findAlongAttrPath so that "nix-instantiate foo.nix -A attr --arg name value" will work if (name, value) is needed in the evaluation leading up to "attr". --- src/nix-instantiate/main.cc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/nix-instantiate') diff --git a/src/nix-instantiate/main.cc b/src/nix-instantiate/main.cc index 0ea639dd91b3..29a28c3d8343 100644 --- a/src/nix-instantiate/main.cc +++ b/src/nix-instantiate/main.cc @@ -178,9 +178,10 @@ Expr strictEval(EvalState & state, Expr e) } -Expr doEval(EvalState & state, string attrPath, bool parseOnly, bool strict, Expr e) +Expr doEval(EvalState & state, string attrPath, bool parseOnly, bool strict, + const ATermMap & autoArgs, Expr e) { - e = findAlongAttrPath(state, attrPath, e); + e = findAlongAttrPath(state, attrPath, autoArgs, e); if (!parseOnly) if (strict) e = strictEval(state, e); @@ -229,6 +230,7 @@ void run(Strings args) if (i == args.end()) throw UsageError("`--arg' requires two arguments"); Expr value = parseExprFromString(state, *i++, absPath(".")); + printMsg(lvlError, format("X %1% Y %2%") % name % value); autoArgs.set(toATerm(name), value); } else if (arg == "--add-root") { @@ -252,7 +254,7 @@ void run(Strings args) if (readStdin) { Expr e = parseStdin(state); - e = doEval(state, attrPath, parseOnly, strict, e); + e = doEval(state, attrPath, parseOnly, strict, autoArgs, e); printResult(state, e, evalOnly, xmlOutput, autoArgs); } @@ -261,7 +263,7 @@ void run(Strings args) { Path path = absPath(*i); Expr e = parseExprFromFile(state, path); - e = doEval(state, attrPath, parseOnly, strict, e); + e = doEval(state, attrPath, parseOnly, strict, autoArgs, e); printResult(state, e, evalOnly, xmlOutput, autoArgs); } -- cgit 1.4.1