Process Nix API changes

This commit is contained in:
Eelco Dolstra
2016-02-11 15:59:47 +01:00
parent 993647d1e3
commit 92d8b59361
8 changed files with 22 additions and 27 deletions

View File

@ -153,7 +153,7 @@ static void findJobsWrapped(EvalState & state, JSONObject & top,
done. */
if (gcRootsDir != "") {
Path root = gcRootsDir + "/" + baseNameOf(drvPath);
if (!pathExists(root)) addPermRoot(*store, drvPath, root, false);
if (!pathExists(root)) state.store->addPermRoot(drvPath, root, false);
}
res.attr("outputs");
@ -253,7 +253,7 @@ int main(int argc, char * * argv)
if (gcRootsDir == "") printMsg(lvlError, "warning: `--gc-roots-dir' not specified");
EvalState state(searchPath);
EvalState state(searchPath, openStore());
AutoArgs autoArgs;
Value * inputsSet = state.allocValue();
@ -280,8 +280,6 @@ int main(int argc, char * * argv)
autoArgs[sInputs].push_back(inputsSet);
}
store = openStore();
Value v;
state.evalFile(releaseExpr, v);