diff options
| author | regnat <rg@regnat.ovh> | 2020-11-25 18:20:35 +0100 |
|---|---|---|
| committer | regnat <rg@regnat.ovh> | 2020-11-27 15:39:24 +0100 |
| commit | 9bd8184f1fb2e91ac4fb7207abe56f2a30a81d97 (patch) | |
| tree | ba3eb830b77b51e7dd7e1229e416e9f67cbb36bb /src/libstore | |
| parent | 13c557fe823549db75c3dc24c99c46e1c4e1378e (diff) | |
Allow fixed-output derivations to depend on (floating) content-addressed ones
Fix an overlook of https://github.com/NixOS/nix/pull/4056
Diffstat (limited to 'src/libstore')
| -rw-r--r-- | src/libstore/build/derivation-goal.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstore/build/derivation-goal.cc b/src/libstore/build/derivation-goal.cc index 0e4504857..76c49f92c 100644 --- a/src/libstore/build/derivation-goal.cc +++ b/src/libstore/build/derivation-goal.cc @@ -493,8 +493,8 @@ void DerivationGoal::inputsRealised() if (useDerivation) { auto & fullDrv = *dynamic_cast<Derivation *>(drv.get()); - if ((!fullDrv.inputDrvs.empty() && - fullDrv.type() == DerivationType::CAFloating) || fullDrv.type() == DerivationType::DeferredInputAddressed) { + if ((!fullDrv.inputDrvs.empty() && derivationIsCA(fullDrv.type())) + || fullDrv.type() == DerivationType::DeferredInputAddressed) { /* We are be able to resolve this derivation based on the now-known results of dependencies. If so, we become a stub goal aliasing that resolved derivation goal */ |