From aa74c7b0bcd31a6c0f75f5fa09f417bcbef4ad14 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 17 Apr 2023 11:22:31 -0400
Subject: Gate experimental features in `DerivationOutput::fromJSON`

This is an entry point for outside data, so we need to check enabled
experimental features here.
---
 src/libstore/derivations.hh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/libstore/derivations.hh')

diff --git a/src/libstore/derivations.hh b/src/libstore/derivations.hh
index ccdde36ca..d00b23b6d 100644
--- a/src/libstore/derivations.hh
+++ b/src/libstore/derivations.hh
@@ -136,11 +136,15 @@ struct DerivationOutput : _DerivationOutputRaw
         const Store & store,
         std::string_view drvName,
         std::string_view outputName) const;
+    /**
+     * @param xpSettings Stop-gap to avoid globals during unit tests.
+     */
     static DerivationOutput fromJSON(
         const Store & store,
         std::string_view drvName,
         std::string_view outputName,
-        const nlohmann::json & json);
+        const nlohmann::json & json,
+        const ExperimentalFeatureSettings & xpSettings = experimentalFeatureSettings);
 };
 
 typedef std::map<std::string, DerivationOutput> DerivationOutputs;
-- 
cgit v1.2.3