nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-10-31 06:31:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

mkDerivation mesonFlags: Fix arm cpu families

Browse Source 
In my haste to unbreak eval, I screwed up and got the bit-widths,
backwards.
This commit is contained in:
John Ericson 2020-04-28 22:55:37 -04:00
parent 38b084f621
commit 05d26adb0a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -257,8 +257,8 @@ in rec {
mesonFlags = if mesonFlags == null then null else let mesonFlags = if mesonFlags == null then null else let
# See https://mesonbuild.com/Reference-tables.html#cpu-families # See https://mesonbuild.com/Reference-tables.html#cpu-families
cpuFamily = platform: with platform; cpuFamily = platform: with platform;
/**/ if isAarch64 then "arm" /**/ if isAarch32 then "arm"
else if isAarch32 then "aarch64" else if isAarch64 then "aarch64"
else if isx86_32 then "x86" else if isx86_32 then "x86"
else if isx86_64 then "x86_64" else if isx86_64 then "x86_64"
else platform.parsed.cpu.family + builtins.toString platform.parsed.cpu.bits; else platform.parsed.cpu.family + builtins.toString platform.parsed.cpu.bits;