diff options
| author | Robert Hensing <roberth@users.noreply.github.com> | 2023-10-24 14:34:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-24 14:34:29 +0200 |
| commit | 5dfc78a8ad75612c6cf6e3d3d5dd4c814956c289 (patch) | |
| tree | 5ad196eacb07ab2fe481ef66fbc4455278d66e7c /nixos/lib | |
| parent | eb4559b1d650029e2afb7679c4a3e26aac0ff490 (diff) | |
| parent | ab1f45f3d3b12a2e2809bea0a18e2b4b873e1810 (diff) | |
Merge pull request #262021 from Enzime/linux-builder-cross
linux-builder: support `x86_64-linux` on `aarch64`
Diffstat (limited to 'nixos/lib')
| -rw-r--r-- | nixos/lib/qemu-common.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/nixos/lib/qemu-common.nix b/nixos/lib/qemu-common.nix index 4fff2e0a6f15e..b946f62d93dc3 100644 --- a/nixos/lib/qemu-common.nix +++ b/nixos/lib/qemu-common.nix @@ -40,6 +40,7 @@ rec { otherHostGuestMatrix = { aarch64-darwin = { aarch64-linux = "${qemuPkg}/bin/qemu-system-aarch64 -machine virt,gic-version=2,accel=hvf:tcg -cpu max"; + inherit (otherHostGuestMatrix.x86_64-darwin) x86_64-linux; }; x86_64-darwin = { x86_64-linux = "${qemuPkg}/bin/qemu-system-x86_64 -machine type=q35,accel=hvf:tcg -cpu max"; |