max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-13 01:36:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixup! Reserve the __contentAddressed derivation parameter

Browse source
This commit is contained in:
regnat 2020-06-17 17:36:33 +02:00
parent 56d75bf4fc
commit 480b54e1c6
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/libstore/build.cc
View file

@ -809,9 +809,6 @@ private:
/* Whether this is a fixed-output derivation. */ /* Whether this is a fixed-output derivation. */
bool fixedOutput; bool fixedOutput;
/* Whether this is a content adressed derivation */
bool contentAddressed = false;
/* Whether to run the build in a private network namespace. */ /* Whether to run the build in a private network namespace. */
bool privateNetwork = false; bool privateNetwork = false;
@ -1198,9 +1195,7 @@ void DerivationGoal::haveDerivation()
parsedDrv = std::make_unique<ParsedDerivation>(drvPath, *drv); parsedDrv = std::make_unique<ParsedDerivation>(drvPath, *drv);
contentAddressed = parsedDrv->contentAddressed(); if (parsedDrv->contentAddressed()) {
if (this->contentAddressed) {
settings.requireExperimentalFeature("content-addressed-paths"); settings.requireExperimentalFeature("content-addressed-paths");
throw Error("content-addressed-paths isn't implemented yet"); throw Error("content-addressed-paths isn't implemented yet");
} }