Merge pull request #112866 from bobrik/ivan/libaom-aarch64-fix

libaom: only disable cpu detectio on arm64 and do it as recommended
This commit is contained in:
Michael Weiss
2021-02-12 12:02:41 +01:00
committed by GitHub

View File

@@ -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 = ''