wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-05 12:21:48 +02:00
Code Activity

Ensure that -I flags get included in nixPath

Browse source 
Also fixes #261.
This commit is contained in:
Eelco Dolstra 2014-05-26 16:50:36 +02:00
parent a8edf185a9
commit 39d72640c2
8 changed files with 33 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/nix-instantiate/nix-instantiate.cc
View file

@ -91,7 +91,17 @@ void processExpr(EvalState & state, const Strings & attrPaths,
void run(Strings args)
{
EvalState state;
/* FIXME: hack. */
Strings searchPath;
Strings args2;
for (Strings::iterator i = args.begin(); i != args.end(); ) {
string arg = *i++;
if (!parseSearchPathArg(arg, i, args.end(), searchPath))
args2.push_back(arg);
}
args = args2;
EvalState state(searchPath);
Strings files;
bool readStdin = false;
bool fromArgs = false;
@ -127,8 +137,6 @@ void run(Strings args)
}
else if (parseOptionArg(arg, i, args.end(), state, autoArgs))
;
else if (parseSearchPathArg(arg, i, args.end(), state))
;
else if (arg == "--add-root") {
if (i == args.end())
throw UsageError("`--add-root' requires an argument");