maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* Allow redirections in search path entries. E.g. if you have a

Browse source 
directory

    /home/eelco/src/stdenv-updates

  that you want to use as the directory for import such as

    with (import <nixpkgs> { });

  then you can say

    $ nix-build -I nixpkgs=/home/eelco/src/stdenv-updates
This commit is contained in:
Eelco Dolstra 2011-08-06 17:48:57 +00:00
parent 1578b2261d
commit c7101dac0b
5 changed files with 28 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/libexpr/parser.y
View file

@ -530,18 +530,36 @@ Expr * EvalState::parseExprFromString(const string & s, const Path & basePath)
void EvalState::addToSearchPath(const string & s)
{
Path path = absPath(s);
size_t pos = s.find('=');
string prefix;
Path path;
if (pos == string::npos) {
path = s;
} else {
prefix = string(s, 0, pos);
path = string(s, pos + 1);
}
path = absPath(path);
if (pathExists(path)) {
debug(format("adding path `%1%' to the search path") % path);
searchPath.insert(searchPathInsertionPoint, path);
searchPath.insert(searchPathInsertionPoint, std::pair<string, Path>(prefix, path));
}
}
Path EvalState::findFile(const string & path)
{
foreach (Paths::iterator, i, searchPath) {
Path res = *i + "/" + path;
foreach (SearchPath::iterator, i, searchPath) {
Path res;
if (i->first.empty())
res = i->second + "/" + path;
else {
if (path.compare(0, i->first.size(), i->first) != 0 ||
(path.size() > i->first.size() && path[i->first.size()] != '/'))
continue;
res = i->second + "/" + string(path, i->first.size());
}
if (pathExists(res)) return canonPath(res);
}
return "";