From f36d4aefd3bb2112527d11d23eae994db5c320f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9ophane=20Hufschmitt?= Date: Thu, 15 Feb 2024 09:50:12 +0100 Subject: Fix the build bef68e53b9d08c99873a5bc60568b7351934ad51 (backport of 31ebc6028b3682969d86a7b39ae87131c41cc604) accidentally broke the build because of a change in the constructor of `SourcePath` between 2.18 and master. Fix that. --- src/libexpr/parser.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libexpr/parser.y b/src/libexpr/parser.y index 28f6ba41b..dd2b20e25 100644 --- a/src/libexpr/parser.y +++ b/src/libexpr/parser.y @@ -693,7 +693,7 @@ SourcePath resolveExprPath(SourcePath path) if (++followCount >= maxFollow) throw Error("too many symbolic links encountered while traversing the path '%s'", path); if (path.lstat().type != InputAccessor::tSymlink) break; - path = {path.accessor, CanonPath(path.readLink(), path.path.parent().value_or(CanonPath::root))}; + path = {CanonPath(path.readLink(), path.path.parent().value_or(CanonPath::root))}; } /* If `path' refers to a directory, append `/default.nix'. */ -- cgit v1.2.3