From e80257f12209c8fbb709b901039ef5199111276e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 15 May 2017 18:50:54 +0200 Subject: [PATCH] Simplify fixed-output check --- src/libstore/build.cc | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/libstore/build.cc b/src/libstore/build.cc index 5ec4cbf66..91156d313 100644 --- a/src/libstore/build.cc +++ b/src/libstore/build.cc @@ -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