Merge remote-tracking branch 'upstream/master' into make-narHash-not-optional

1 files changed, 11 insertions, 2 deletions

diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index dba5e4af4..3370af63d 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -4876,8 +4876,17 @@ void Worker::run(const Goals & _topGoals)
             waitForInput();
         else {
             if (awake.empty() && 0 == settings.maxBuildJobs)
-                throw Error("unable to start any build; either increase '--max-jobs' "
-                            "or enable remote builds");
+            {
+                if (getMachines().empty())
+                   throw Error("unable to start any build; either increase '--max-jobs' "
+                            "or enable remote builds."
+                            "\nhttps://nixos.org/nix/manual/#chap-distributed-builds");
+                else
+                   throw Error("unable to start any build; remote machines may not have "
+                            "all required system features."
+                            "\nhttps://nixos.org/nix/manual/#chap-distributed-builds");
+
+            }
             assert(!awake.empty());
         }
     }