diff options
author | John Ericson <git@JohnEricson.me> | 2020-04-28 22:55:37 -0400 |
---|---|---|
committer | John Ericson <git@JohnEricson.me> | 2020-04-28 22:56:20 -0400 |
commit | 05d26adb0ad90ec17ad38a0ed638e9be33cbc7c7 (patch) | |
tree | e509052f60f684a5ffc939e772278b6a4663fcd4 /pkgs/stdenv | |
parent | 38b084f621b51c721341331ae13e321010d8eebb (diff) | |
download | nixpkgs-05d26adb0ad90ec17ad38a0ed638e9be33cbc7c7.tar nixpkgs-05d26adb0ad90ec17ad38a0ed638e9be33cbc7c7.tar.gz nixpkgs-05d26adb0ad90ec17ad38a0ed638e9be33cbc7c7.tar.bz2 nixpkgs-05d26adb0ad90ec17ad38a0ed638e9be33cbc7c7.tar.lz nixpkgs-05d26adb0ad90ec17ad38a0ed638e9be33cbc7c7.tar.xz nixpkgs-05d26adb0ad90ec17ad38a0ed638e9be33cbc7c7.tar.zst nixpkgs-05d26adb0ad90ec17ad38a0ed638e9be33cbc7c7.zip |
mkDerivation mesonFlags: Fix arm cpu families
In my haste to unbreak eval, I screwed up and got the bit-widths, backwards.
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r-- | pkgs/stdenv/generic/make-derivation.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index b06541a7e41..09879451d8e 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -257,8 +257,8 @@ in rec { mesonFlags = if mesonFlags == null then null else let # See https://mesonbuild.com/Reference-tables.html#cpu-families cpuFamily = platform: with platform; - /**/ if isAarch64 then "arm" - else if isAarch32 then "aarch64" + /**/ 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; |