Add binfmt aarch64 emulation

Signed-off-by: Joonas Rautiola <joonas.rautiola@unikie.com>
tiiuae · May 23, 2024 · 274cf3f · 274cf3f
1 parent 18f4518
commit 274cf3f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/hosts/builders/build3/configuration.nix b/hosts/builders/build3/configuration.nix
@@ -12,6 +12,7 @@
   imports =
     [
       ../ficolo.nix
+      ../cross-compilation.nix
       ../developers.nix
       ../yubikey.nix
       inputs.sops-nix.nixosModules.sops
@@ -43,8 +44,6 @@
 
   nix = {
     settings = {
-      # add ability to build 32 bit
-      extra-platforms = ["i686-linux"];
       trusted-users = ["@wheel" "build3"];
     };
 

diff --git a/hosts/builders/build4/configuration.nix b/hosts/builders/build4/configuration.nix
@@ -4,6 +4,7 @@
   imports =
     [
       ../ficolo.nix
+      ../cross-compilation.nix
       ../yubikey.nix
     ]
     ++ (with self.nixosModules; [
@@ -15,11 +16,6 @@
 
   networking.hostName = "build4";
 
-  nix.settings = {
-    # add ability to build 32 bit
-    extra-platforms = ["i686-linux"];
-  };
-
   users.users.yubimaster.openssh.authorizedKeys.keys = [
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA2BcpFzSXOuK9AzN+J1HBVnuVV8D3wgdEwPuILNy2aM signer"
   ];

diff --git a/hosts/builders/cross-compilation.nix b/hosts/builders/cross-compilation.nix
@@ -0,0 +1,9 @@
+# SPDX-FileCopyrightText: 2022-2024 TII (SSRC) and the Ghaf contributors
+# SPDX-License-Identifier: Apache-2.0
+{
+  # list of systems to emulate using binfmt
+  boot.binfmt.emulatedSystems = ["aarch64-linux"];
+
+  # extra nix build platforms to enable
+  nix.settings.extra-platforms = ["i686-linux"];
+}