wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-07 10:11:47 +02:00
Code Activity

parentPath -> parentInputPath

Browse source
This commit is contained in:
Eelco Dolstra 2024-09-16 14:52:23 +02:00
parent 09d71974ef
commit 71d4bb8c2e
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/libflake/flake/flake.cc
View file

@ -404,7 +404,7 @@ LockedFlake lockFlake(
{ {
FlakeInput input; FlakeInput input;
SourcePath sourcePath; SourcePath sourcePath;
std::optional<InputPath> parentPath; // FIXME: rename to inputPathPrefix? std::optional<InputPath> parentInputPath; // FIXME: rename to inputPathPrefix?
}; };
std::map<InputPath, Override> overrides; std::map<InputPath, Override> overrides;
@ -469,7 +469,7 @@ LockedFlake lockFlake(
Override { Override {
.input = inputOverride, .input = inputOverride,
.sourcePath = sourcePath, .sourcePath = sourcePath,
.parentPath = inputPathPrefix // FIXME: should this be inputPath? .parentInputPath = inputPathPrefix // FIXME: should this be inputPath?
}); });
} }
} }
@ -531,7 +531,7 @@ LockedFlake lockFlake(
auto overridenParentPath = auto overridenParentPath =
input.ref->input.isRelative() input.ref->input.isRelative()
? std::optional<InputPath>(hasOverride ? i->second.parentPath : inputPathPrefix) ? std::optional<InputPath>(hasOverride ? i->second.parentInputPath : inputPathPrefix)
: std::nullopt; : std::nullopt;
auto resolveRelativePath = [&]() -> std::optional<SourcePath> auto resolveRelativePath = [&]() -> std::optional<SourcePath>