Merge branch 'rework-options' of https://github.com/copumpkin/nix

2017-04-13 16:15:51 +02:00
parent 2040240e23 e7cb2847ab
commit 1860070548
11 changed files with 222 additions and 93 deletions
@@ -299,7 +299,7 @@ EvalState::EvalState(const Strings & _searchPath, ref<Store> store)
 {
    countCalls = getEnv("NIX_COUNT_CALLS", "0") != "0";

-    restricted = settings.get("restrict-eval", false);
+    restricted = settings.restrictEval;

    assert(gcInitialised);