diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-05-26T15·02+0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-05-26T15·02+0200 |
commit | 62a6eeb1f3da0a5954ad2da54c454eb7fc1c6e5d (patch) | |
tree | cb1fec96ce5ae6ad830a4afe65578210c0e1c778 /src/libexpr/nixexpr.hh | |
parent | 39d72640c2459dc2fa689bfe8b756ee193f7b98a (diff) |
Make the Nix search path declarative
Nix search path lookups like <nixpkgs> are now desugared to ‘findFile nixPath <nixpkgs>’, where ‘findFile’ is a new primop. Thus you can override the search path simply by saying let nixPath = [ { prefix = "nixpkgs"; path = "/my-nixpkgs"; } ]; in ... <nixpkgs> ... In conjunction with ‘scopedImport’ (commit c273c15cb13bb86420dda1e5341a4e19517532b5), the Nix search path can be propagated across imports, e.g. let overrides = { nixPath = [ ... ] ++ builtins.nixPath; import = fn: scopedImport overrides fn; scopedImport = attrs: fn: scopedImport (overrides // attrs) fn; builtins = builtins // overrides; }; in scopedImport overrides ./nixos
Diffstat (limited to 'src/libexpr/nixexpr.hh')
-rw-r--r-- | src/libexpr/nixexpr.hh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libexpr/nixexpr.hh b/src/libexpr/nixexpr.hh index fbd5bad81ebc..8826ad23238e 100644 --- a/src/libexpr/nixexpr.hh +++ b/src/libexpr/nixexpr.hh @@ -142,6 +142,7 @@ struct ExprVar : Expr unsigned int level; unsigned int displ; + ExprVar(const Symbol & name) : name(name) { }; ExprVar(const Pos & pos, const Symbol & name) : pos(pos), name(name) { }; COMMON_METHODS Value * maybeThunk(EvalState & state, Env & env); |