Merge pull request #8692 from obsidiansystems/add-another-xp-check

Feature gate `DownstreamPlaceholder::unknownCaOutput`
2023-08-07 13:11:44 +02:00
parent 9113b4252b caabc4f648
commit 5df0f1755f
9 changed files with 57 additions and 31 deletions
@@ -1031,14 +1031,15 @@ void EvalState::mkOutputString(
    Value & value,
    const StorePath & drvPath,
    const std::string outputName,
-    std::optional<StorePath> optOutputPath)
+    std::optional<StorePath> optOutputPath,
+    const ExperimentalFeatureSettings & xpSettings)
 {
    value.mkString(
        optOutputPath
            ? store->printStorePath(*std::move(optOutputPath))
            /* Downstream we would substitute this for an actual path once
               we build the floating CA derivation */
-            : DownstreamPlaceholder::unknownCaOutput(drvPath, outputName).render(),
+            : DownstreamPlaceholder::unknownCaOutput(drvPath, outputName, xpSettings).render(),
        NixStringContext {
            NixStringContextElem::Built {
                .drvPath = drvPath,