Handle store symlinks in flake directories

E.g. 'nix path-info ./result' inside a flake directory now works
again.

1 files changed, 8 insertions, 0 deletions

diff --git a/src/libexpr/flake/flakeref.cc b/src/libexpr/flake/flakeref.cc
index 24af09124..7631cd53a 100644
--- a/src/libexpr/flake/flakeref.cc
+++ b/src/libexpr/flake/flakeref.cc
@@ -143,6 +143,14 @@ FlakeRef::FlakeRef(const std::string & uri_, bool allowRelative)
         IsPath d;
         if (allowRelative) {
             d.path = absPath(uri);
+            try {
+                if (!S_ISDIR(lstat(d.path).st_mode))
+                    throw BadFlakeRef("path '%s' is not a flake (sub)directory");
+            } catch (SysError & e) {
+                if (e.errNo == ENOENT || e.errNo == EISDIR)
+                    throw BadFlakeRef("flake '%s' does not exist");
+                throw;
+            }
             while (true) {
                 if (pathExists(d.path + "/.git")) break;
                 subdir = baseNameOf(d.path) + (subdir.empty() ? "" : "/" + subdir);