aviallon/nixos-lib
1
0
Fork 0
mirror of https://github.com/aviallon/nixos-lib.git synced 2026-04-06 01:38:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[General] Add i686 to x86_64 builders

Browse source
This commit is contained in:
Antoine Viallon 2022-10-22 13:23:00 +02:00
parent 4279289f25
commit 79e389e3e9
Signed by: aviallon
GPG key ID: 186FC35EDEB25716
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
general.nix
View file

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