From 71d4bb8c2e58cd3eeab412f5bdccc8dad7ad44c5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 16 Sep 2024 14:52:23 +0200 Subject: [PATCH] parentPath -> parentInputPath --- src/libflake/flake/flake.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libflake/flake/flake.cc b/src/libflake/flake/flake.cc index 632968f50b0..461ac0a9068 100644 --- a/src/libflake/flake/flake.cc +++ b/src/libflake/flake/flake.cc @@ -404,7 +404,7 @@ LockedFlake lockFlake( { FlakeInput input; SourcePath sourcePath; - std::optional parentPath; // FIXME: rename to inputPathPrefix? + std::optional parentInputPath; // FIXME: rename to inputPathPrefix? }; std::map overrides; @@ -469,7 +469,7 @@ LockedFlake lockFlake( Override { .input = inputOverride, .sourcePath = sourcePath, - .parentPath = inputPathPrefix // FIXME: should this be inputPath? + .parentInputPath = inputPathPrefix // FIXME: should this be inputPath? }); } } @@ -531,7 +531,7 @@ LockedFlake lockFlake( auto overridenParentPath = input.ref->input.isRelative() - ? std::optional(hasOverride ? i->second.parentPath : inputPathPrefix) + ? std::optional(hasOverride ? i->second.parentInputPath : inputPathPrefix) : std::nullopt; auto resolveRelativePath = [&]() -> std::optional