fixup: Re-enable import .drv code

NixOS · Aug 26, 2024 · 359d124 · 359d124
1 parent 68a5cfd
commit 359d124
Showing 1 changed file with 1 addition and 9 deletions.
diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
@@ -178,10 +178,6 @@ static void import(EvalState & state, const PosIdx pos, Value & vPath, Value * v
     auto path = realisePath(state, pos, vPath, std::nullopt);
     auto path2 = path.path.abs();
 
-// FIXME: corruption?
-// TODO(tomberek): re-enable this code?
-#if 0
-    // FIXME
     auto isValidDerivationInStore = [&]() -> std::optional<StorePath> {
         if (!state.store->isStorePath(path2))
             return std::nullopt;
@@ -219,11 +215,7 @@ static void import(EvalState & state, const PosIdx pos, Value & vPath, Value * v
         state.forceFunction(**state.vImportedDrvToDerivation, pos, "while evaluating imported-drv-to-derivation.nix.gen.hh");
         v.mkApp(*state.vImportedDrvToDerivation, w);
         state.forceAttrs(v, pos, "while calling imported-drv-to-derivation.nix.gen.hh");
-    }
-
-    else
-#endif
-    {
+    } else {
         if (!vScope)
             state.evalFile(path, v);
         else {