Merge branch 'aarch64-armv7' of git://github.com/lheckemann/nix

Support extra compatible architectures (#1916)

1 files changed, 3 insertions, 1 deletions

diff --git a/src/build-remote/build-remote.cc b/src/build-remote/build-remote.cc
index 9cd01bb61bf5..38dbe3e58b26 100644
--- a/src/build-remote/build-remote.cc
+++ b/src/build-remote/build-remote.cc
@@ -98,7 +98,9 @@ int main (int argc, char * * argv)
             source >> drvPath;
             auto requiredFeatures = readStrings<std::set<std::string>>(source);
 
-            auto canBuildLocally = amWilling && (neededSystem == settings.thisSystem);
+            auto canBuildLocally = amWilling
+                &&  (  neededSystem == settings.thisSystem
+                    || settings.extraPlatforms.get().count(neededSystem) > 0);
 
             /* Error ignored here, will be caught later */
             mkdir(currentLoad.c_str(), 0777);