aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorregnat <rg@regnat.ovh>2020-06-17 17:36:33 +0200
committerregnat <rg@regnat.ovh>2020-06-17 17:37:04 +0200
commit480b54e1c6a200a2d4a39c1fa24fa195db12953f (patch)
treec3f13ce59a8ef4ed27e6018aba2ff8e202632aab
parent56d75bf4fcb06da1a577c6e381f4afef57f30243 (diff)
fixup! Reserve the `__contentAddressed` derivation parameter
-rw-r--r--src/libstore/build.cc7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index 9b72175c7..e1d812b09 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -809,9 +809,6 @@ private:
/* Whether this is a fixed-output derivation. */
bool fixedOutput;
- /* Whether this is a content adressed derivation */
- bool contentAddressed = false;
-
/* Whether to run the build in a private network namespace. */
bool privateNetwork = false;
@@ -1198,9 +1195,7 @@ void DerivationGoal::haveDerivation()
parsedDrv = std::make_unique<ParsedDerivation>(drvPath, *drv);
- contentAddressed = parsedDrv->contentAddressed();
-
- if (this->contentAddressed) {
+ if (parsedDrv->contentAddressed()) {
settings.requireExperimentalFeature("content-addressed-paths");
throw Error("content-addressed-paths isn't implemented yet");
}