From e99678639dfbfa651ba84c3030ea5568cb9e975c Mon Sep 17 00:00:00 2001 From: Ivan Babrou Date: Thu, 11 Feb 2021 23:28:02 -0800 Subject: [PATCH] libaom: only disable cpu detectio on arm64 and do it as recommended Having `OFF` instead of `0` makes x86_64 build unhappy. --- pkgs/development/libraries/libaom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libaom/default.nix b/pkgs/development/libraries/libaom/default.nix index 0522cdf2d50..e35f8385915 100644 --- a/pkgs/development/libraries/libaom/default.nix +++ b/pkgs/development/libraries/libaom/default.nix @@ -32,9 +32,9 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DENABLE_TESTS=OFF" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ # CPU detection isn't supported on Darwin and breaks the aarch64-darwin build: - "-DCONFIG_RUNTIME_CPU_DETECT=OFF" + "-DCONFIG_RUNTIME_CPU_DETECT=0" ]; postFixup = ''