diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-02-05 00:02:31 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-05 00:02:31 +0000 |
| commit | bc833a50cc17209eeeb202281de5a8bcb366d786 (patch) | |
| tree | 13a79ab51f96557a81808de44209c509141af14f /pkgs/stdenv | |
| parent | aaed9c9ee15387b1fb7cd243a923636ce8219ac5 (diff) | |
| parent | 19ad2a2b84a99b8025ace91ba7b80d12d8ae71db (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/generic/make-derivation.nix | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index c53eed3dfa127..01520c858dfa3 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -399,10 +399,8 @@ else let # See https://mesonbuild.com/Reference-tables.html#cpu-families cpuFamily = platform: with platform; /**/ if isAarch32 then "arm" - else if isAarch64 then "aarch64" else if isx86_32 then "x86" - else if isx86_64 then "x86_64" - else platform.parsed.cpu.family + builtins.toString platform.parsed.cpu.bits; + else platform.uname.processor; crossFile = builtins.toFile "cross-file.conf" '' [properties] |