wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 14:51:16 +02:00
Code Activity

Merge pull request #12430 from DeterminateSystems/relative-path-literals

Browse source 
Parser: Respect the accessor of the source file for relative paths
This commit is contained in:
John Ericson 2025-02-10 10:28:44 -05:00 • committed by GitHub
commit 1f485b6c5e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/libexpr/parser.y
View file

@ -359,11 +359,18 @@ string_parts_interpolated
path_start path_start
: PATH { : PATH {
Path path(absPath(std::string_view{$1.p, $1.l}, state->basePath.path.abs())); std::string_view literal({$1.p, $1.l});
Path path(absPath(literal, state->basePath.path.abs()));
/* add back in the trailing '/' to the first segment */ /* add back in the trailing '/' to the first segment */
if ($1.p[$1.l-1] == '/' && $1.l > 1) if (literal.size() > 1 && literal.back() == '/')
path += "/"; path += '/';
$$ = new ExprPath(ref<SourceAccessor>(state->rootFS), std::move(path)); $$ =
/* Absolute paths are always interpreted relative to the
root filesystem accessor, rather than the accessor of the
current Nix expression. */
literal.front() == '/'
? new ExprPath(state->rootFS, std::move(path))
: new ExprPath(state->basePath.accessor, std::move(path));
} }
| HPATH { | HPATH {
if (state->settings.pureEval) { if (state->settings.pureEval) {