DerivationGoal: only retry if output closure incomplete is only problem

(cherry picked from commit bd9eb5c)
NixOS · Dec 22, 2020 · c29fffe · c29fffe
1 parent 8803753
commit c29fffe
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/libstore/build.cc b/src/libstore/build.cc
@@ -1222,8 +1222,13 @@ void DerivationGoal::outputsSubstituted()
 
     /*  If the substitutes form an incomplete closure, then we should
         build the dependencies of this derivation, but after that, we
-        can still use the substitutes for this derivation itself. */
-    if (nrIncompleteClosure > 0) retrySubstitution = true;
+        can still use the substitutes for this derivation itself.
+
+        If the nrIncompleteClosure != nrFailed, we have another issue as well.
+        In particular, it may be the case that the hole in the closure is
+        an output of the current derivation, which causes a loop if retried.
+     */
+    if (nrIncompleteClosure > 0 && nrIncompleteClosure == nrFailed) retrySubstitution = true;
 
     nrFailed = nrNoSubstituters = nrIncompleteClosure = 0;