diff options
| author | Alyssa Ross <hi@alyssa.is> | 2025-04-11 10:32:19 +0200 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2025-04-11 10:32:19 +0200 |
| commit | 904b79c69646703ed42094988d827e191fe709b7 (patch) | |
| tree | a9c97cb612fee676b8c5ff2988aed34922382cfc /lib | |
| parent | Merge master into staging-next (diff) | |
| download | nixpkgs-904b79c69646703ed42094988d827e191fe709b7.tar.gz | |
lib.systems: force qemuArch to "aarch64" on aarch64
qemu architecture names are fixed — we're using uname here just
because it's more likely to be correct than CPU name (see e.g. POWER).
This means that aarch64 is always called aarch64, even on Darwin where
uname reports arm64.
Fixes: 61582c704327 ("lib/systems: use Darwin architecture names for `config` and `uname`")
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/systems/default.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/systems/default.nix b/lib/systems/default.nix index 97f3d0dced17..a19972326195 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -305,6 +305,8 @@ let qemuArch = if final.isAarch32 then "arm" + else if final.isAarch64 then + "aarch64" else if final.isS390 && !final.isS390x then null else if final.isx86_64 then |