From 42454e57de5487e63b162edc61505810b3971194 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Thu, 23 Oct 2025 21:14:28 -0400 Subject: [PATCH] libtheora: apply ARMv7 conditionals to all 32-bit ARM armv6l (and presumably armv5tel) have the same problems as armv7l, so change the conditional from isArmv7 to isAarch32. Fixes building ffmpeg on armv6l. --- pkgs/by-name/li/libtheora/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libtheora/package.nix b/pkgs/by-name/li/libtheora/package.nix index f372aada393a..e23fb1c0cdc5 100644 --- a/pkgs/by-name/li/libtheora/package.nix +++ b/pkgs/by-name/li/libtheora/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { patches = lib.optionals stdenv.hostPlatform.isMinGW [ ./mingw-remove-export.patch ]; - postPatch = lib.optionalString stdenv.hostPlatform.isArmv7 '' + postPatch = lib.optionalString stdenv.hostPlatform.isAarch32 '' patchShebangs lib/arm/arm2gnu.pl ''; @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config validatePkgConfig ] - ++ lib.optionals stdenv.hostPlatform.isArmv7 [ + ++ lib.optionals stdenv.hostPlatform.isAarch32 [ # Needed to run lib/arm/arm2gnu.pl for ARM assembly optimizations perl ];