From 79e389e3e961da59c56acb321f4642687ef99944 Mon Sep 17 00:00:00 2001
From: Antoine Viallon <antoine@lesviallon.fr>
Date: Sat, 22 Oct 2022 13:23:00 +0200
Subject: [PATCH] [General] Add i686 to x86_64 builders

---
 general.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/general.nix b/general.nix
index 8dd83bf..860518e 100644
--- a/general.nix
+++ b/general.nix
@@ -11,19 +11,22 @@ let
   mkBuildMachine = {
     hostName,
     cores,
-    system ? "x86_64-linux" ,
+    systems ? [ "x86_64-linux" ] ,
     threads ? (cores * 2),
     features ? [ ],
     x86ver ? 1 ,
     ...
-  }@attrs: rec {
-    inherit hostName system;
+  }@attrs: let
+    speedFactor = getSpeed cores threads;
+  in {
+    inherit hostName speedFactor;
+    systems = systems
+      ++ optional (any (s: s == "x86_64-linux") systems) "i686-linux"
+    ;
     sshUser = "builder";
     sshKey = toString buildUserKeyFile;
-    speedFactor = getSpeed cores threads;
     maxJobs = myLib.math.log2 cores;
     supportedFeatures = [ "kvm" "benchmark" ]
-      ++ optional (system == "x86_64-linux") "i686-linux"
       ++ optional (speedFactor > 8) "big-parallel"
       ++ optional (x86ver >= 2) "gccarch-x86-64-v2"
       ++ optional (x86ver >= 3) "gccarch-x86-64-v3"