parseExprFromFile -> evalFile

parseExprFromFile() should be avoided since it doesn't cache anything.
NixOS · Jan 16, 2018 · 23fa7e3 · 23fa7e3
1 parent ba75c69
commit 23fa7e3
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/src/nix/installables.cc b/src/nix/installables.cc
@@ -30,10 +30,8 @@ Value * SourceExprCommand::getSourceExpr(EvalState & state)
 
     vSourceExpr = state.allocValue();
 
-    if (file != "") {
-        Expr * e = state.parseExprFromFile(resolveExprPath(lookupFileArg(state, file)));
-        state.eval(e, *vSourceExpr);
-    }
+    if (file != "")
+        state.evalFile(lookupFileArg(state, file), *vSourceExpr);
 
     else {