1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 03:30:45 +00:00

Merge pull request #213633 from alyssais/mkDerivation-meson-exotic

stdenv.mkDerivation: fix meson for some archs
This commit is contained in:
superherointj 2023-02-04 18:43:43 -03:00 committed by GitHub
commit 2c77d453e3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

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]