From 62a6eeb1f3da0a5954ad2da54c454eb7fc1c6e5d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 26 May 2014 17:02:22 +0200 Subject: Make the Nix search path declarative MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Nix search path lookups like are now desugared to ‘findFile nixPath ’, where ‘findFile’ is a new primop. Thus you can override the search path simply by saying let nixPath = [ { prefix = "nixpkgs"; path = "/my-nixpkgs"; } ]; in ... ... 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 --- src/libexpr/primops.cc | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'src/libexpr/primops.cc') diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc index e492ff683a..333748973d 100644 --- a/src/libexpr/primops.cc +++ b/src/libexpr/primops.cc @@ -654,6 +654,37 @@ static void prim_readFile(EvalState & state, const Pos & pos, Value * * args, Va } +/* Find a file in the Nix search path. Used to implement paths, + which are desugared to ‘findFile nixPath "x"’. */ +static void prim_findFile(EvalState & state, const Pos & pos, Value * * args, Value & v) +{ + state.forceList(*args[0], pos); + + SearchPath searchPath; + + for (unsigned int n = 0; n < args[0]->list.length; ++n) { + Value & v2(*args[0]->list.elems[n]); + state.forceAttrs(v2, pos); + + string prefix; + Bindings::iterator i = v2.attrs->find(state.symbols.create("prefix")); + if (i != v2.attrs->end()) + prefix = state.forceStringNoCtx(*i->value, pos); + + i = v2.attrs->find(state.symbols.create("path")); + if (i == v2.attrs->end()) + throw EvalError(format("attribute `path' missing, at %1%") % pos); + PathSet context; + string path = state.coerceToPath(pos, *i->value, context); + + searchPath.push_back(std::pair(prefix, path)); + } + + string path = state.forceStringNoCtx(*args[1], pos); + mkPath(v, state.findFile(searchPath, path).c_str()); +} + + /************************************************************* * Creating files *************************************************************/ @@ -1293,6 +1324,7 @@ void EvalState::createBaseEnv() addPrimOp("baseNameOf", 1, prim_baseNameOf); addPrimOp("dirOf", 1, prim_dirOf); addPrimOp("__readFile", 1, prim_readFile); + addPrimOp("__findFile", 2, prim_findFile); // Creating files addPrimOp("__toXML", 1, prim_toXML); -- cgit 1.4.1