From e827e6288f2029d314c7df18ce4fc8cc044c5fdc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 7 Feb 2022 13:27:59 +0100
Subject: [PATCH] Fix scopedImport

---
 src/libexpr/primops.cc | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index ec2060c9d..c15051d4a 100644
--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -165,8 +165,6 @@ static void import(EvalState & state, const Pos & pos, Value & vPath, Value * vS
 {
     auto path = realisePath(state, pos, vPath);
 
-    state.evalFile(path, v);
-
 #if 0
     // FIXME
     auto isValidDerivationInStore = [&]() -> std::optional<StorePath> {
@@ -207,7 +205,9 @@ static void import(EvalState & state, const Pos & pos, Value & vPath, Value * vS
         state.forceAttrs(v, pos);
     }
 
-    else {
+    else
+#endif
+    {
         if (!vScope)
             state.evalFile(path, v);
         else {
@@ -233,7 +233,6 @@ static void import(EvalState & state, const Pos & pos, Value & vPath, Value * vS
             e->eval(state, *env, v);
         }
     }
-#endif
 }
 
 static RegisterPrimOp primop_scopedImport(RegisterPrimOp::Info {