libav: bugfix updates for both branches; maintain

This commit is contained in:
Vladimír Čunát 2014-02-03 21:43:55 +01:00
parent 15eed826b6
commit 3fe1656376

View File

@ -26,15 +26,15 @@ with { inherit (stdenv.lib) optional optionals; };
let let
result = { result = {
libav_9 = libavFun "9.10" "039hx7z8lmsiljy4wj87hk8lkxspbxbrjv43v3lc38cxfx0fdnw3"; libav_9 = libavFun "9.11" "1ad7vyxp0w8dw6ngc16fz0ngsjlgk6h8bpphghqia5sqkbl10ca3";
libav_0_8 = libavFun "0.8.9" "0zzphhkpwsdp2k3ijqr8miqsp4vk7dgcrcrv06qda1s09qb82lag"; libav_0_8 = libavFun "0.8.10" "0sxmj4qsd3ljygvdjz7ly46nf7sqmaqka4hx65b1jdji12al1djc";
}; };
libavFun = version : sha256 : stdenv.mkDerivation rec { libavFun = version : sha256 : stdenv.mkDerivation rec {
name = "libav-${version}"; name = "libav-${version}";
src = fetchurl { src = fetchurl {
url = "http://libav.org/releases/${name}.tar.xz"; url = "${meta.homepage}/releases/${name}.tar.xz";
inherit sha256; inherit sha256;
}; };
configureFlags = configureFlags =
@ -105,6 +105,7 @@ let
license = with licenses; if enableUnfree then unfree #ToDo: redistributable or not? license = with licenses; if enableUnfree then unfree #ToDo: redistributable or not?
else if enableGPL then gpl2Plus else lgpl21Plus; else if enableGPL then gpl2Plus else lgpl21Plus;
platforms = platforms.all; platforms = platforms.all;
maintainers = [ maintainers.vcunat ];
}; };
}; # libavFun }; # libavFun