From 4d045a7de8c674a71a7a1c2c6b5ac5cb19c3f607 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Tue, 14 May 2024 22:16:58 +0100 Subject: [PATCH] libaom: don't disable runtime cpu detection on aarch64-darwin it seems to both work and be necessary now if we don't want to run into illegal instructions --- pkgs/development/libraries/libaom/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/libraries/libaom/default.nix b/pkgs/development/libraries/libaom/default.nix index 474b1664fbe9..16a9e872aae8 100644 --- a/pkgs/development/libraries/libaom/default.nix +++ b/pkgs/development/libraries/libaom/default.nix @@ -47,9 +47,6 @@ stdenv.mkDerivation rec { "-DENABLE_TESTS=OFF" ] ++ lib.optionals enableVmaf [ "-DCONFIG_TUNE_VMAF=1" - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ - # CPU detection isn't supported on Darwin and breaks the aarch64-darwin build: - "-DCONFIG_RUNTIME_CPU_DETECT=0" ] ++ lib.optionals (isCross && !stdenv.hostPlatform.isx86) [ "-DCMAKE_ASM_COMPILER=${stdenv.cc.targetPrefix}as" ] ++ lib.optionals stdenv.isAarch32 [