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

Remove registerOutputs from drv goal

Browse source 
Easy to inline in one spot, and assert in the other.
This commit is contained in:
Las 2025-03-10 23:15:59 +00:00 • committed by John Ericson
parent a87589a035
commit 0e7e1f5b57
4 changed files with 11 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/libstore/unix/build/local-derivation-goal.cc
View file

@ -2330,15 +2330,7 @@ void LocalDerivationGoal::runChild()
SingleDrvOutputs LocalDerivationGoal::registerOutputs()
{
/* When using a build hook, the build hook can register the output
as valid (by doing `nix-store --import'). If so we don't have
to do anything here.
We can only early return when the outputs are known a priori. For
floating content-addressing derivations this isn't the case.
*/
if (hook)
return DerivationGoal::registerOutputs();
assert(!hook);
std::map<std::string, ValidPathInfo> infos;

2
src/libstore/unix/build/local-derivation-goal.hh
View file

@ -239,7 +239,7 @@ struct LocalDerivationGoal : public DerivationGoal
* Check that the derivation outputs all exist and register them
* as valid.
*/
SingleDrvOutputs registerOutputs() override;
SingleDrvOutputs registerOutputs();
void signRealisation(Realisation &) override;