diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-09-03 13:17:51 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-09-03 13:17:51 +0000 |
| commit | ef4f5ba85e487f567115d60e3cb4b53d81af6ea1 (patch) | |
| tree | c3fe3050c1c9e5404298e72a30a36c0dd9e724ac /src/libexpr/attr-path.hh | |
| parent | 06bb2d95b4d8232ef0cd0059d2609d2211d0e3e6 (diff) | |
Work on Values instead of Exprs
This prevents some duplicate evaluation in nix-env and
nix-instantiate.
Also, when traversing ~/.nix-defexpr, only read regular files with the
extension .nix. Previously it was reading files like
.../channels/binary-caches/<name>. The only reason this didn't cause
problems is pure luck (namely, <name> shadows an actual Nix
expression, the binary-caches files happen to be syntactically valid
Nix expressions, and we iterate over the directory contents in just
the right order).
Diffstat (limited to 'src/libexpr/attr-path.hh')
| -rw-r--r-- | src/libexpr/attr-path.hh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libexpr/attr-path.hh b/src/libexpr/attr-path.hh index d3aad7461..46a341950 100644 --- a/src/libexpr/attr-path.hh +++ b/src/libexpr/attr-path.hh @@ -7,7 +7,7 @@ namespace nix { -void findAlongAttrPath(EvalState & state, const string & attrPath, - Bindings & autoArgs, Expr * e, Value & v); +Value * findAlongAttrPath(EvalState & state, const string & attrPath, + Bindings & autoArgs, Value & vIn); } |