mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #25 from fkz/fix-store

Browse source 
fix nix-repl compilation after we don't have a global store variable anymore
This commit is contained in:
Eelco Dolstra 2016-02-29 12:46:15 +01:00
commit b1cc845413
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
nix-repl.cc
View file

@ -38,7 +38,7 @@ struct NixRepl
StringSet completions; StringSet completions;
StringSet::iterator curCompletion; StringSet::iterator curCompletion;
NixRepl(const Strings & searchPath); NixRepl(const Strings & searchPath, nix::ref<Store> store);
void mainLoop(const Strings & files); void mainLoop(const Strings & files);
void completePrefix(string prefix); void completePrefix(string prefix);
bool getLine(string & input, const char * prompt); bool getLine(string & input, const char * prompt);
@ -73,8 +73,8 @@ string removeWhitespace(string s)
} }
NixRepl::NixRepl(const Strings & searchPath) NixRepl::NixRepl(const Strings & searchPath, nix::ref<Store> store)
: state(searchPath) : state(searchPath, store)
, staticEnv(false, &state.staticBaseEnv) , staticEnv(false, &state.staticBaseEnv)
{ {
curDir = absPath("."); curDir = absPath(".");
@ -334,7 +334,7 @@ bool NixRepl::processLine(string line)
if (!getDerivation(state, v, drvInfo, false)) if (!getDerivation(state, v, drvInfo, false))
throw Error("expression does not evaluation to a derivation, so I can't build it"); throw Error("expression does not evaluation to a derivation, so I can't build it");
Path drvPath = drvInfo.queryDrvPath(); Path drvPath = drvInfo.queryDrvPath();
if (drvPath == "" || !store->isValidPath(drvPath)) if (drvPath == "" || !state.store->isValidPath(drvPath))
throw Error("expression did not evaluate to a valid derivation"); throw Error("expression did not evaluate to a valid derivation");
if (command == ":b") { if (command == ":b") {
@ -645,8 +645,7 @@ int main(int argc, char * * argv)
return true; return true;
}); });
store = openStore(); NixRepl repl(searchPath, openStore());
NixRepl repl(searchPath);
repl.mainLoop(files); repl.mainLoop(files);
}); });
} }