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/nix/app.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/nix/app.cc')
| -rw-r--r-- | src/nix/app.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/nix/app.cc b/src/nix/app.cc index e678b54f0..e0f68b4fc 100644 --- a/src/nix/app.cc +++ b/src/nix/app.cc @@ -22,11 +22,12 @@ StringPairs resolveRewrites( StringPairs res; for (auto & dep : dependencies) if (auto drvDep = std::get_if<BuiltPathBuilt>(&dep.path)) - for (auto & [ outputName, outputPath ] : drvDep->outputs) - res.emplace( - DownstreamPlaceholder::unknownCaOutput(drvDep->drvPath, outputName).render(), - store.printStorePath(outputPath) - ); + if (experimentalFeatureSettings.isEnabled(Xp::CaDerivations)) + for (auto & [ outputName, outputPath ] : drvDep->outputs) + res.emplace( + DownstreamPlaceholder::unknownCaOutput(drvDep->drvPath, outputName).render(), + store.printStorePath(outputPath) + ); return res; } |