summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKranium Gikos Mendoza <kranium@gikos.net>2021-08-27 20:09:15 +1000
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2021-09-26 09:29:19 +0000
commit2fea3122d4fe967a74d14ee49cfaeb2a046292f8 (patch)
tree156b25606a0d4dbdc53f29040c7114c005a192be
parentnvidia_x11: 470.57.02 → 470.63.01 (diff)
downloadnixpkgs-origin/backport-136079-to-release-21.05.tar.gz
libaom: disable NEON on armv7lorigin/backport-136079-to-release-21.05
(cherry picked from commit b7066a57deb8bb3f13ab7f2ef5e389c0559edac0)
-rw-r--r--pkgs/development/libraries/libaom/default.nix4
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/development/libraries/libaom/default.nix b/pkgs/development/libraries/libaom/default.nix
index 83f5de4d0130..180c78e5ab29 100644
--- a/pkgs/development/libraries/libaom/default.nix
+++ b/pkgs/development/libraries/libaom/default.nix
@@ -35,6 +35,10 @@ stdenv.mkDerivation rec {
] ++ 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 stdenv.isAarch32 [
+ # armv7l-hf-multiplatform does not support NEON
+ # see lib/systems/platform.nix
+ "-DENABLE_NEON=0"
];
postFixup = ''