Merge remote-tracking branch 'ethnt/linux-builder-systems-config' into linux-builder-big-config-take-2

1 files changed, 21 insertions, 5 deletions

diff --git a/modules/nix/linux-builder.nix b/modules/nix/linux-builder.nix
index 14a7a96..edd6e0e 100644
--- a/modules/nix/linux-builder.nix
+++ b/modules/nix/linux-builder.nix
@@ -71,8 +71,7 @@ in
         {var}`supportedFeatures`.
 
         This sets the corresponding `nix.buildMachines.*.mandatoryFeatures` option.
-      '';
-    };
+    '';
 
     maxJobs = mkOption {
       type = types.ints.positive;
@@ -99,7 +98,8 @@ in
 
         Use `null` when trying to change the special localhost builder without a
         protocol which is for example used by hydra.
-    '';
+      '';
+    };
 
     speedFactor = mkOption {
       type = types.ints.positive;
@@ -126,6 +126,23 @@ in
       '';
     };
 
+    systems = mkOption {
+      type = types.listOf types.str;
+      default = [ "${stdenv.hostPlatform.uname.processor}-linux" ];
+      example = literalExpression ''
+        [
+          "x86_64-linux"
+          "aarch64-linux"
+        ]
+      '';
+      description = lib.mdDoc ''
+        This option specifies system types the build machine can execute derivations on.
+
+        This sets the corresponding `nix.buildMachines.*.systems` option.
+      '';
+    };
+
+
     workingDirectory = mkOption {
       type = types.str;
       default = "/var/lib/darwin-builder";
@@ -184,9 +201,8 @@ in
       hostName = "linux-builder";
       sshUser = "builder";
       sshKey = "/etc/nix/builder_ed25519";
-      system = "${stdenv.hostPlatform.uname.processor}-linux";
       publicHostKey = "c3NoLWVkMjU1MTkgQUFBQUMzTnphQzFsWkRJMU5URTVBQUFBSUpCV2N4Yi9CbGFxdDFhdU90RStGOFFVV3JVb3RpQzVxQkorVXVFV2RWQ2Igcm9vdEBuaXhvcwo=";
-      inherit (cfg) mandatoryFeatures maxJobs protocol speedFactor supportedFeatures;
+      inherit (cfg) mandatoryFeatures maxJobs protocol speedFactor supportedFeatures systems;
     }];
 
     nix.settings.builders-use-substitutes = true;