b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

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

Browse source 
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
parent 5ea8bde3e7 e99678639d
commit 2c2ce6bf9e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/libraries/libaom/default.nix
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 = ''