mirror of
https://github.com/NixOS/nix.git
synced 2025-11-15 06:52:43 +01:00
Limit ParsedDerivation just to the derivation's environment
This moves us towards getting rid of `ParsedDerivation` and just having `DerivationOptions`. Co-Authored-By: HaeNoe <git@haenoe.party>
This commit is contained in:
parent
d285b80033
commit
1e31b60043
8 changed files with 52 additions and 38 deletions
|
|
@ -1576,7 +1576,12 @@ void LocalDerivationGoal::initEnv()
|
|||
|
||||
void LocalDerivationGoal::writeStructuredAttrs()
|
||||
{
|
||||
if (auto structAttrsJson = parsedDrv->prepareStructuredAttrs(worker.store, *drvOptions, inputPaths)) {
|
||||
if (auto structAttrsJson = parsedDrv->prepareStructuredAttrs(
|
||||
worker.store,
|
||||
*drvOptions,
|
||||
inputPaths,
|
||||
drv->outputs))
|
||||
{
|
||||
auto json = structAttrsJson.value();
|
||||
nlohmann::json rewritten;
|
||||
for (auto & [i, v] : json["outputs"].get<nlohmann::json::object_t>()) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue