From b6304bf11dd14fe0b278b7e78dfdfa94f7cfa1dc Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 30 Jan 2023 18:57:37 +0000 Subject: stdenv.mkDerivation: fix meson for some archs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit platform.uname.processor seems to be what we want in many more cases than what we were using before — it does the right thing for aarch64, x86_64, riscv32, riscv64, mips, mips64, powerpc, and powerpc64 (the latter three of which were broken before). This fixes cross-compilation of systemd for PowerPC/POWER platforms. --- pkgs/stdenv/generic/make-derivation.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 517cfc03aea5..08bd836e10e7 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -392,10 +392,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] -- cgit v1.2.3