diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2023-07-12 23:33:43 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2023-07-13 07:56:33 -0400 |
| commit | caabc4f64889d5a4c47d6102b3aa1d3c80bbc107 (patch) | |
| tree | 6859d20eec12b628ca77c07dee7e41e2e6a91f00 /src/libstore/derivations.cc | |
| parent | cafb5e8a1751b2c951347d5d9188b2e0bee357be (diff) | |
Feature gate `DownstreamPlaceholder::unknownCaOutput`
This is a part of CA derivations that we forgot to put behind the
experimental feature.
This was caught by @fricklerhandwerk in
https://github.com/NixOS/nix/pull/8369#discussion_r1258133719
Diffstat (limited to 'src/libstore/derivations.cc')
| -rw-r--r-- | src/libstore/derivations.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/libstore/derivations.cc b/src/libstore/derivations.cc index 6f63685d4..234d70ec5 100644 --- a/src/libstore/derivations.cc +++ b/src/libstore/derivations.cc @@ -878,9 +878,11 @@ std::optional<BasicDerivation> Derivation::tryResolve( for (auto & [inputDrv, inputOutputs] : inputDrvs) { for (auto & outputName : inputOutputs) { if (auto actualPath = get(inputDrvOutputs, { inputDrv, outputName })) { - inputRewrites.emplace( - DownstreamPlaceholder::unknownCaOutput(inputDrv, outputName).render(), - store.printStorePath(*actualPath)); + if (experimentalFeatureSettings.isEnabled(Xp::CaDerivations)) { + inputRewrites.emplace( + DownstreamPlaceholder::unknownCaOutput(inputDrv, outputName).render(), + store.printStorePath(*actualPath)); + } resolved.inputSrcs.insert(*actualPath); } else { warn("output '%s' of input '%s' missing, aborting the resolving", |