diff options
| author | Martin Weinelt <mweinelt@users.noreply.github.com> | 2024-05-15 15:00:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-15 15:00:23 +0200 |
| commit | 2a949a0095046aa24b7491b1f85535277835cff8 (patch) | |
| tree | ab0b49bbbdc89b319936c25e1aeb7bc1174eb603 /pkgs | |
| parent | ef850861bca0d6061b4b7cd6a3714e2b107f3836 (diff) | |
| parent | 4d045a7de8c674a71a7a1c2c6b5ac5cb19c3f607 (diff) | |
Merge pull request #311751 from risicle/ris-libaom-runtime-cpu-detection-aarch64-darwin
libaom: don't disable runtime cpu detection on aarch64-darwin
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/libaom/default.nix | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/pkgs/development/libraries/libaom/default.nix b/pkgs/development/libraries/libaom/default.nix index 474b1664fbe9d..16a9e872aae8f 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 [ |