From cc3913e4584beb19e7af00572db119d2638333d5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 13 Dec 2023 13:27:23 +0100
Subject: [PATCH 1/3] Remove unused variable

---
 src/libexpr/eval.hh | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/libexpr/eval.hh b/src/libexpr/eval.hh
index f3f6d35b9..f452dcb9f 100644
--- a/src/libexpr/eval.hh
+++ b/src/libexpr/eval.hh
@@ -335,11 +335,6 @@ private:
 
     std::map<std::string, std::optional<std::string>> searchPathResolved;
 
-    /**
-     * Cache used by checkSourcePath().
-     */
-    std::unordered_map<Path, SourcePath> resolvedPaths;
-
     /**
      * Cache used by prim_match().
      */

From 103ca0bde5d4f32745d4c3aee534cf4aa0a69a9d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 13 Dec 2023 13:27:29 +0100
Subject: [PATCH 2/3] Improve SourcePath display

---
 src/libfetchers/input-accessor.hh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libfetchers/input-accessor.hh b/src/libfetchers/input-accessor.hh
index d5ac238b1..f385e6231 100644
--- a/src/libfetchers/input-accessor.hh
+++ b/src/libfetchers/input-accessor.hh
@@ -130,7 +130,7 @@ struct SourcePath
     { return accessor->getPhysicalPath(path); }
 
     std::string to_string() const
-    { return path.abs(); }
+    { return accessor->showPath(path); }
 
     /**
      * Append a `CanonPath` to this path.

From faa4cae9aed4e9f8c40ed8c6fe00bd0216c3b0ea Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 13 Dec 2023 13:27:39 +0100
Subject: [PATCH 3/3] LibExprTest: Ignore $NIX_PATH

Otherwise a broken $NIX_PATH can cause the test suite to fail.
---
 tests/unit/libexpr-support/tests/libexpr.hh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/unit/libexpr-support/tests/libexpr.hh b/tests/unit/libexpr-support/tests/libexpr.hh
index 968431446..d720cedde 100644
--- a/tests/unit/libexpr-support/tests/libexpr.hh
+++ b/tests/unit/libexpr-support/tests/libexpr.hh
@@ -8,6 +8,7 @@
 #include "nixexpr.hh"
 #include "eval.hh"
 #include "eval-inline.hh"
+#include "eval-settings.hh"
 #include "store-api.hh"
 
 #include "tests/libstore.hh"
@@ -18,6 +19,7 @@ namespace nix {
             static void SetUpTestSuite() {
                 LibStoreTest::SetUpTestSuite();
                 initGC();
+                evalSettings.nixPath = {};
             }
 
         protected: