Merge "fix: good errors for failures caused by allowSubstitutes" into main

src/libstore/build/derivation-goal.cc

@@ -261,24 +261,29 @@ Goal::WorkResult DerivationGoal::haveDerivation(bool inBuildSlot)
        through substitutes.  If that doesn't work, we'll build
        them. */
     WaitForGoals result;
-    if (settings.useSubstitutes && parsedDrv->substitutesAllowed())
-        for (auto & [outputName, status] : initialOutputs) {
-            if (!status.wanted) continue;
-            if (!status.known)
-                result.goals.insert(
-                    worker.makeDrvOutputSubstitutionGoal(
-                        DrvOutput{status.outputHash, outputName},
-                        buildMode == bmRepair ? Repair : NoRepair
-                    )
-                );
-            else {
-                auto * cap = getDerivationCA(*drv);
-                result.goals.insert(worker.makePathSubstitutionGoal(
-                    status.known->path,
-                    buildMode == bmRepair ? Repair : NoRepair,
-                    cap ? std::optional { *cap } : std::nullopt));
+    if (settings.useSubstitutes) {
+        if (parsedDrv->substitutesAllowed()) {
+            for (auto & [outputName, status] : initialOutputs) {
+                if (!status.wanted) continue;
+                if (!status.known)
+                    result.goals.insert(
+                        worker.makeDrvOutputSubstitutionGoal(
+                            DrvOutput{status.outputHash, outputName},
+                            buildMode == bmRepair ? Repair : NoRepair
+                        )
+                    );
+                else {
+                    auto * cap = getDerivationCA(*drv);
+                    result.goals.insert(worker.makePathSubstitutionGoal(
+                        status.known->path,
+                        buildMode == bmRepair ? Repair : NoRepair,
+                        cap ? std::optional { *cap } : std::nullopt));
+                }
             }
+        } else {
+            trace("skipping substitute because allowSubstitutes is false");
         }
+    }
 
     if (result.goals.empty()) { /* to prevent hang (no wake-up event) */
         return outputsSubstitutionTried(inBuildSlot);

src/libstore/build/local-derivation-goal.cc

@@ -451,13 +451,23 @@ std::set<int> LocalDerivationGoal::startBuilder()
     killSandbox(false);
 
     /* Right platform? */
-    if (!parsedDrv->canBuildLocally(worker.store))
-        throw Error("a '%s' with features {%s} is required to build '%s', but I am a '%s' with features {%s}",
-            drv->platform,
-            concatStringsSep(", ", parsedDrv->getRequiredSystemFeatures()),
-            worker.store.printStorePath(drvPath),
-            settings.thisSystem,
-            concatStringsSep<StringSet>(", ", worker.store.systemFeatures));
+    if (!parsedDrv->canBuildLocally(worker.store)) {
+        HintFmt addendum{""};
+        if (settings.useSubstitutes && !parsedDrv->substitutesAllowed()) {
+            addendum = HintFmt("\n\nHint: the failing derivation has %s set to %s, forcing it to be built rather than substituted.\n"
+                "Passing %s to force substitution may resolve this failure if the path is available in a substituter.",
+                "allowSubstitutes", "false", "--always-allow-substitutes");
+        }
+        throw Error({
+            .msg = HintFmt("a '%s' with features {%s} is required to build '%s', but I am a '%s' with features {%s}%s",
+                drv->platform,
+                concatStringsSep(", ", parsedDrv->getRequiredSystemFeatures()),
+                worker.store.printStorePath(drvPath),
+                settings.thisSystem,
+                concatStringsSep<StringSet>(", ", worker.store.systemFeatures),
+                Uncolored(addendum))
+        });
+    }
 
     /* Create a temporary directory where the build will take
        place. */