wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 14:51:16 +02:00
Code Activity

* Pass the autoArgs to findAlongAttrPath so that "nix-instantiate

Browse source 
foo.nix -A attr --arg name value" will work if (name, value) is
  needed in the evaluation leading up to "attr".
This commit is contained in:
Eelco Dolstra 2006-08-23 16:20:14 +00:00
parent b19cebc513
commit 9638f3f393
3 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/libexpr/attr-path.cc
View file

@ -12,7 +12,8 @@ bool isAttrs(EvalState & state, Expr e, ATermMap & attrs)
}
Expr findAlongAttrPath(EvalState & state, const string & attrPath, Expr e)
Expr findAlongAttrPath(EvalState & state, const string & attrPath,
const ATermMap & autoArgs, Expr e)
{
Strings tokens = tokenizeString(attrPath, ".");
@ -33,7 +34,7 @@ Expr findAlongAttrPath(EvalState & state, const string & attrPath, Expr e)
if (string2Int(attr, attrIndex)) apType = apIndex;
/* Evaluate the expression. */
e = evalExpr(state, autoCallFunction(evalExpr(state, e), ATermMap(1)));
e = evalExpr(state, autoCallFunction(evalExpr(state, e), autoArgs));
/* It should evaluate to either an attribute set or an
expression, according to what is specified in the