ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 21:33:03 +03:00
Code Issues Projects Releases Wiki Activity

libass: 0.14.0 -> 0.15.0

Browse Source 
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:
Max Hausch 2020-10-28 20:45:57 +01:00
parent b66f954dfc
commit 8b8130f26a
No known key found for this signature in database
GPG Key ID: 028B30F7D5394C0A
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/libraries/libass/default.nix
View File

@ -1,8 +1,7 @@
{ stdenv, fetchurl, pkgconfig, yasm { stdenv, fetchurl, pkgconfig, yasm
, freetype, fribidi , freetype, fribidi, harfbuzz
, encaSupport ? true, enca ? null # enca support , encaSupport ? true, enca ? null # enca support
, fontconfigSupport ? true, fontconfig ? null # fontconfig support , fontconfigSupport ? true, fontconfig ? null # fontconfig support
, harfbuzzSupport ? true, harfbuzz ? null # harfbuzz support
, rasterizerSupport ? false # Internal rasterizer , rasterizerSupport ? false # Internal rasterizer
, largeTilesSupport ? false # Use larger tiles in the rasterizer , largeTilesSupport ? false # Use larger tiles in the rasterizer
, libiconv , libiconv
@ -10,7 +9,6 @@
assert encaSupport -> enca != null; assert encaSupport -> enca != null;
assert fontconfigSupport -> fontconfig != null; assert fontconfigSupport -> fontconfig != null;
assert harfbuzzSupport -> harfbuzz != null;
let let
mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}"; mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}";
@ -19,27 +17,25 @@ in
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libass"; pname = "libass";
version = "0.14.0"; version = "0.15.0";
src = fetchurl { src = fetchurl {
url = "https://github.com/libass/libass/releases/download/${version}/${pname}-${version}.tar.xz"; url = "https://github.com/libass/libass/releases/download/${version}/${pname}-${version}.tar.xz";
sha256 = "18iqznl4mabhj9ywfsz4kwvbsplcv1jjxq50nxssvbj8my1267w8"; sha256 = "0cz8v6kh3f2j5rdjrra2z0h715fa16vjm7kambvqx9hak86262cz";
}; };
configureFlags = [ configureFlags = [
(mkFlag encaSupport "enca") (mkFlag encaSupport "enca")
(mkFlag fontconfigSupport "fontconfig") (mkFlag fontconfigSupport "fontconfig")
(mkFlag harfbuzzSupport "harfbuzz")
(mkFlag rasterizerSupport "rasterizer") (mkFlag rasterizerSupport "rasterizer")
(mkFlag largeTilesSupport "large-tiles") (mkFlag largeTilesSupport "large-tiles")
]; ];
nativeBuildInputs = [ pkgconfig yasm ]; nativeBuildInputs = [ pkgconfig yasm ];
buildInputs = [ freetype fribidi ] buildInputs = [ freetype fribidi harfbuzz ]
++ optional encaSupport enca ++ optional encaSupport enca
++ optional fontconfigSupport fontconfig ++ optional fontconfigSupport fontconfig
++ optional harfbuzzSupport harfbuzz
++ optional stdenv.isDarwin libiconv; ++ optional stdenv.isDarwin libiconv;
meta = { meta = {