From f50117ba4c2f2441c526c69c19119c2bcfe5e922 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Sun, 18 May 2025 10:01:57 +0200
Subject: [PATCH] Revert storeFS to use makeFSSourceAccessor()

Need to investigate why store->getFSAccessor() breaks a test.
---
 src/libexpr/eval.cc                     | 2 +-
 tests/functional/flakes/follow-paths.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc
index 531a932bd..868933b95 100644
--- a/src/libexpr/eval.cc
+++ b/src/libexpr/eval.cc
@@ -270,7 +270,7 @@ EvalState::EvalState(
                    exception, and make union source accessor
                    catch it, so we don't need to do this hack.
                  */
-                {CanonPath(store->storeDir), store->getFSAccessor(settings.pureEval)},
+                {CanonPath(store->storeDir), makeFSSourceAccessor(dirOf(store->toRealPath(StorePath::dummy)))}
             }))
     , rootFS(
         ({
diff --git a/tests/functional/flakes/follow-paths.sh b/tests/functional/flakes/follow-paths.sh
index 8abbf3233..25f26137b 100755
--- a/tests/functional/flakes/follow-paths.sh
+++ b/tests/functional/flakes/follow-paths.sh
@@ -131,7 +131,7 @@ EOF
 git -C $flakeFollowsA add flake.nix
 
 expect 1 nix flake lock $flakeFollowsA 2>&1 | grep '/flakeB.*is forbidden in pure evaluation mode'
-#expect 1 nix flake lock --impure $flakeFollowsA 2>&1 | grep '/flakeB.*does not exist' # FIXME
+expect 1 nix flake lock --impure $flakeFollowsA 2>&1 | grep '/flakeB.*does not exist' # FIXME
 
 # Test relative non-flake inputs.
 cat > $flakeFollowsA/flake.nix <<EOF