libtheora: fix ARM build (#413319)

authored by Arne Keller and committed by GitHub 4f2be019 e1514c30

+23 -9
+23 -9
pkgs/by-name/li/libtheora/package.nix
··· 1 { 2 lib, 3 stdenv, 4 - fetchurl, 5 autoreconfHook, 6 libogg, 7 libvorbis, 8 pkg-config, 9 testers, 10 validatePkgConfig, 11 }: ··· 14 pname = "libtheora"; 15 version = "1.2.0"; 16 17 - src = fetchurl { 18 - url = "https://downloads.xiph.org/releases/theora/libtheora-${finalAttrs.version}.tar.gz"; 19 - hash = "sha256-J5MnM5kDtUTCipKurafQ3P0Dl7WcLzaMxpisVvUVkG4="; 20 }; 21 22 patches = lib.optionals stdenv.hostPlatform.isMinGW [ ./mingw-remove-export.patch ]; 23 24 configureFlags = [ "--disable-examples" ]; 25 ··· 30 ]; 31 outputDoc = "devdoc"; 32 33 - nativeBuildInputs = [ 34 - autoreconfHook 35 - pkg-config 36 - validatePkgConfig 37 - ]; 38 39 propagatedBuildInputs = [ 40 libogg 41 libvorbis 42 ]; 43 44 passthru = { 45 tests.pkg-config = testers.hasPkgConfigModules {
··· 1 { 2 lib, 3 stdenv, 4 + fetchFromGitHub, 5 autoreconfHook, 6 libogg, 7 libvorbis, 8 pkg-config, 9 + perl, 10 testers, 11 validatePkgConfig, 12 }: ··· 15 pname = "libtheora"; 16 version = "1.2.0"; 17 18 + src = fetchFromGitHub { 19 + owner = "xiph"; 20 + repo = "theora"; 21 + tag = "v${finalAttrs.version}"; 22 + hash = "sha256-kzZh4V6wZX9MetDutuqjRenmdpy4PHaRU9MgtIwPpiU="; 23 }; 24 25 patches = lib.optionals stdenv.hostPlatform.isMinGW [ ./mingw-remove-export.patch ]; 26 + 27 + postPatch = lib.optionalString stdenv.hostPlatform.isArmv7 '' 28 + patchShebangs lib/arm/arm2gnu.pl 29 + ''; 30 31 configureFlags = [ "--disable-examples" ]; 32 ··· 37 ]; 38 outputDoc = "devdoc"; 39 40 + nativeBuildInputs = 41 + [ 42 + autoreconfHook 43 + pkg-config 44 + validatePkgConfig 45 + ] 46 + ++ lib.optionals stdenv.hostPlatform.isArmv7 [ 47 + # Needed to run lib/arm/arm2gnu.pl for ARM assembly optimizations 48 + perl 49 + ]; 50 51 propagatedBuildInputs = [ 52 libogg 53 libvorbis 54 ]; 55 + 56 + strictDeps = true; 57 58 passthru = { 59 tests.pkg-config = testers.hasPkgConfigModules {