* Fix the `--fallback' switch.

* Fix the substitutes tests.

1 files changed, 6 insertions, 0 deletions

diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index 1de50a14041c..026721f3b9d8 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -472,6 +472,12 @@ void DerivationGoal::outputsSubstituted()
 {
     trace("all outputs substituted (maybe)");
 
+    if (nrFailed > 0 && !tryFallback) {
+        throw Error(format("some substitutes for the outputs of derivation `%1%' failed; try `--fallback'") % drvPath);
+    }
+
+    nrFailed = 0;
+
     if (checkPathValidity(false).size() == 0) {
         amDone(true);
         return;