mirror of
https://github.com/NixOS/nix
synced 2025-06-28 22:01:15 +02:00
Introduce EvalStore::storePath
This abstracts over a common case. Good for brevity, and enabling further experiments.
This commit is contained in:
parent
782c63fc8e
commit
de22f58dfc
5 changed files with 21 additions and 6 deletions
|
@ -423,7 +423,7 @@ static Flake getFlake(
|
|||
auto storePath = copyInputToStore(state, lockedRef.input, originalRef.input, accessor);
|
||||
|
||||
// Re-parse flake.nix from the store.
|
||||
return readFlake(state, originalRef, resolvedRef, lockedRef, state.rootPath(state.store->printStorePath(storePath)), lockRootAttrPath);
|
||||
return readFlake(state, originalRef, resolvedRef, lockedRef, state.storePath(storePath), lockRootAttrPath);
|
||||
}
|
||||
|
||||
Flake getFlake(EvalState & state, const FlakeRef & originalRef, bool useRegistries)
|
||||
|
@ -784,7 +784,7 @@ LockedFlake lockFlake(
|
|||
// FIXME: allow input to be lazy.
|
||||
auto storePath = copyInputToStore(state, lockedRef.input, input.ref->input, accessor);
|
||||
|
||||
return {state.rootPath(state.store->printStorePath(storePath)), lockedRef};
|
||||
return {state.storePath(storePath), lockedRef};
|
||||
}
|
||||
}();
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue