From 05d26adb0ad90ec17ad38a0ed638e9be33cbc7c7 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 28 Apr 2020 22:55:37 -0400 Subject: [PATCH] mkDerivation mesonFlags: Fix arm cpu families In my haste to unbreak eval, I screwed up and got the bit-widths, backwards. --- pkgs/stdenv/generic/make-derivation.nix | 4 ++-- 1 file 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;