nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-16 07:22:43 +01:00
Code Activity

Fix flake registry ignoring dir parameter

Browse source 
This broke in e3042f10af.

(cherry picked from commit bccdb95a86)
This commit is contained in:
Cole Helbling 2025-09-07 15:27:14 +02:00 • committed by Mergify
parent 766a236014
commit ba46c7d0f2
3 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/libflake/flake.cc
View file

@ -340,8 +340,9 @@ static Flake getFlake(
// Fetch a lazy tree first.
auto cachedInput = state.inputCache->getAccessor(state.store, originalRef.input, useRegistries);
auto resolvedRef = FlakeRef(std::move(cachedInput.resolvedInput), originalRef.subdir);
auto lockedRef = FlakeRef(std::move(cachedInput.lockedInput), originalRef.subdir);
auto subdir = fetchers::maybeGetStrAttr(cachedInput.extraAttrs, "dir").value_or(originalRef.subdir);
auto resolvedRef = FlakeRef(std::move(cachedInput.resolvedInput), subdir);
auto lockedRef = FlakeRef(std::move(cachedInput.lockedInput), subdir);
// Parse/eval flake.nix to get at the input.self attributes.
auto flake = readFlake(state, originalRef, resolvedRef, lockedRef, {cachedInput.accessor}, lockRootAttrPath);