public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #139522 from NixOS/backport-136079-to-release-21.05 

[Backport release-21.05] libaom: disable NEON on armv7l
This commit is contained in:
Guillaume Girol 2021-10-01 18:44:52 +00:00 committed by GitHub
parent d4c8773058 2fea3122d4
commit b1e31c7711
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/libaom/default.nix
View File

@ -35,6 +35,10 @@ stdenv.mkDerivation rec {
] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
# CPU detection isn't supported on Darwin and breaks the aarch64-darwin build: # CPU detection isn't supported on Darwin and breaks the aarch64-darwin build:
"-DCONFIG_RUNTIME_CPU_DETECT=0" "-DCONFIG_RUNTIME_CPU_DETECT=0"
] ++ lib.optionals stdenv.isAarch32 [
# armv7l-hf-multiplatform does not support NEON
# see lib/systems/platform.nix
"-DENABLE_NEON=0"
]; ];
postFixup = '' postFixup = ''