Skip to content

Commit 29486ef

Browse files
committed
fix out of sync DerivationOptions
1 parent 72a9b35 commit 29486ef

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

src/libexpr/primops.cc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1347,8 +1347,6 @@ static void derivationStrictInternal(
13471347
jsonObject.reset();
13481348
}
13491349

1350-
drv.options = DerivationOptions::fromEnv(drv.env);
1351-
13521350
/* Everything in the context of the strings in the derivation
13531351
attributes should be added as dependencies of the resulting
13541352
derivation. */
@@ -1465,6 +1463,8 @@ static void derivationStrictInternal(
14651463
DerivationOutput::Deferred { });
14661464
}
14671465

1466+
drv.options = DerivationOptions::fromEnv(drv.env);
1467+
14681468
auto hashModulo = hashDerivationModulo(*state.store, Derivation(drv), true);
14691469
switch (hashModulo.kind) {
14701470
case DrvHash::Kind::Regular:
@@ -1492,6 +1492,8 @@ static void derivationStrictInternal(
14921492
}
14931493
}
14941494

1495+
drv.options = DerivationOptions::fromEnv(drv.env);
1496+
14951497
/* Write the resulting term into the Nix store directory. */
14961498
auto drvPath = writeDerivation(*state.store, drv, state.repair);
14971499
auto drvPathS = state.store->printStorePath(drvPath);

0 commit comments

Comments
 (0)