b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

stdenv.mkDerivation: fix meson for some archs

Browse source 
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.
This commit is contained in:
Alyssa Ross 2023-01-30 18:57:37 +00:00
parent 2be9646b90
commit b6304bf11d
No known key found for this signature in database
GPG key ID: F9DBED4859B271C0
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/stdenv/generic/make-derivation.nix
View file

@ -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]