Commit 42454e57 authored by Ben Wolsieffer's avatar Ben Wolsieffer
Browse files

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.
parent 1d941d35

pkgs/by-name/li/libtheora/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -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

  ];