nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-12-02 23:20:59 +01:00
Code Activity

Don't use DerivedPath::toJSON()

Browse source 
It doesn't work on unrealized paths.
This commit is contained in:
Eelco Dolstra 2025-03-14 17:05:38 +01:00
parent 762114b7c4
commit fd0d824fa5
4 changed files with 22 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/libstore/build/derivation-goal.cc
View file

@ -1566,9 +1566,10 @@ Goal::Done DerivationGoal::done(
logger->result(
act ? act->id : getCurActivity(),
resBuildResult,
KeyedBuildResult(
buildResult,
DerivedPath::Built{.drvPath = makeConstantStorePathRef(drvPath), .outputs = wantedOutputs}).toJSON(worker.store));
nlohmann::json(
KeyedBuildResult(
buildResult,
DerivedPath::Built{.drvPath = makeConstantStorePathRef(drvPath), .outputs = wantedOutputs})));
return amDone(buildResult.success() ? ecSuccess : ecFailed, std::move(ex));
}

7
src/libstore/build/substitution-goal.cc
View file

@ -42,9 +42,10 @@ Goal::Done PathSubstitutionGoal::done(
logger->result(
getCurActivity(),
resBuildResult,
KeyedBuildResult(
buildResult,
DerivedPath::Opaque{storePath}).toJSON(worker.store));
nlohmann::json(
KeyedBuildResult(
buildResult,
DerivedPath::Opaque{storePath})));
return amDone(result);
}