diff options
author | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
---|---|---|
committer | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
commit | 80d90d9b204f7c17912740f9f414fe5d59f293ba (patch) | |
tree | 5f2065a06e724270610760d59d01c6888b375a46 /infra/libkookie/nixpkgs/pkgs/development/libraries/libass/default.nix | |
parent | 3a31a84c7d3e589035ad08499206aac44a81f424 (diff) | |
parent | 83cbad92d73216bb0d9187c56cce0b91f9121d5a (diff) |
Merge commit '83cbad92d73216bb0d9187c56cce0b91f9121d5a' into main
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/development/libraries/libass/default.nix')
-rw-r--r-- | infra/libkookie/nixpkgs/pkgs/development/libraries/libass/default.nix | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/libass/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/libass/default.nix index 508a57b203d2..9d8cf7434c23 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/libraries/libass/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/libass/default.nix @@ -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 = { |