mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-05 12:02:47 +00:00
libass: 0.14.0 -> 0.15.0
Harfbuzz is now being required unconditionally as per https://github.com/libass/libass/releases/tag/0.15.0 Fixes: CVE-2020-26682
This commit is contained in:
parent
b66f954dfc
commit
8b8130f26a
|
@ -1,8 +1,7 @@
|
|||
{ stdenv, fetchurl, pkgconfig, yasm
|
||||
, freetype, fribidi
|
||||
, freetype, fribidi, harfbuzz
|
||||
, encaSupport ? true, enca ? null # enca support
|
||||
, fontconfigSupport ? true, fontconfig ? null # fontconfig support
|
||||
, harfbuzzSupport ? true, harfbuzz ? null # harfbuzz support
|
||||
, rasterizerSupport ? false # Internal rasterizer
|
||||
, largeTilesSupport ? false # Use larger tiles in the rasterizer
|
||||
, libiconv
|
||||
|
@ -10,7 +9,6 @@
|
|||
|
||||
assert encaSupport -> enca != null;
|
||||
assert fontconfigSupport -> fontconfig != null;
|
||||
assert harfbuzzSupport -> harfbuzz != null;
|
||||
|
||||
let
|
||||
mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}";
|
||||
|
@ -19,27 +17,25 @@ in
|
|||
with stdenv.lib;
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libass";
|
||||
version = "0.14.0";
|
||||
version = "0.15.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/libass/libass/releases/download/${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "18iqznl4mabhj9ywfsz4kwvbsplcv1jjxq50nxssvbj8my1267w8";
|
||||
sha256 = "0cz8v6kh3f2j5rdjrra2z0h715fa16vjm7kambvqx9hak86262cz";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
(mkFlag encaSupport "enca")
|
||||
(mkFlag fontconfigSupport "fontconfig")
|
||||
(mkFlag harfbuzzSupport "harfbuzz")
|
||||
(mkFlag rasterizerSupport "rasterizer")
|
||||
(mkFlag largeTilesSupport "large-tiles")
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig yasm ];
|
||||
|
||||
buildInputs = [ freetype fribidi ]
|
||||
buildInputs = [ freetype fribidi harfbuzz ]
|
||||
++ optional encaSupport enca
|
||||
++ optional fontconfigSupport fontconfig
|
||||
++ optional harfbuzzSupport harfbuzz
|
||||
++ optional stdenv.isDarwin libiconv;
|
||||
|
||||
meta = {
|
||||
|
|
Loading…
Reference in a new issue