lix-project/lix
20
55
Fork 31
Code Issues 344 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Simplify fixed-output check

Browse source
This commit is contained in:
Eelco Dolstra 2017-05-15 18:50:54 +02:00
parent c05d9ae7a5
commit e80257f122
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/libstore/build.cc
View file

@ -1066,12 +1066,8 @@ void DerivationGoal::haveDerivation()
/* Reject doing a hash build of anything other than a fixed-output
derivation. */
if (buildMode == bmHash) {
if (drv->outputs.size() != 1 ||
drv->outputs.find("out") == drv->outputs.end() ||
drv->outputs["out"].hashAlgo == "")
throw Error(format("cannot do a hash build of non-fixed-output derivation ‘%1%’") % drvPath);
}
if (buildMode == bmHash && !drv->isFixedOutput())
throw Error("cannot do a hash build of non-fixed-output derivation ‘%1%’", drvPath);
/* We are first going to try to create the invalid output paths
through substitutes. If that doesn't work, we'll build