summary refs log tree commit diff
path: root/pkgs/development/libraries/libass
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/development/libraries/libass')
-rw-r--r--pkgs/development/libraries/libass/default.nix22
1 files changed, 7 insertions, 15 deletions
diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/development/libraries/libass/default.nix
index 508a57b203d..afc99220534 100644
--- a/pkgs/development/libraries/libass/default.nix
+++ b/pkgs/development/libraries/libass/default.nix
@@ -1,45 +1,37 @@
-{ stdenv, fetchurl, pkgconfig, yasm
-, freetype, fribidi
-, encaSupport ? true, enca ? null # enca support
+{ lib, stdenv, fetchurl, pkg-config, yasm
+, freetype, fribidi, harfbuzz
 , 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
 }:
 
-assert encaSupport -> enca != null;
 assert fontconfigSupport -> fontconfig != null;
-assert harfbuzzSupport -> harfbuzz != null;
 
 let
   mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}";
 in
 
-with stdenv.lib;
+with lib;
 stdenv.mkDerivation rec {
   pname = "libass";
-  version = "0.14.0";
+  version = "0.15.1";
 
   src = fetchurl {
     url = "https://github.com/libass/libass/releases/download/${version}/${pname}-${version}.tar.xz";
-    sha256 = "18iqznl4mabhj9ywfsz4kwvbsplcv1jjxq50nxssvbj8my1267w8";
+    sha256 = "sha256-HN05ydAHsG5zfnc4AE1/OM+bHpKEPzcweyTn/2OrjlM=";
   };
 
   configureFlags = [
-    (mkFlag encaSupport "enca")
     (mkFlag fontconfigSupport "fontconfig")
-    (mkFlag harfbuzzSupport "harfbuzz")
     (mkFlag rasterizerSupport "rasterizer")
     (mkFlag largeTilesSupport "large-tiles")
   ];
 
-  nativeBuildInputs = [ pkgconfig yasm ];
+  nativeBuildInputs = [ pkg-config yasm ];
 
-  buildInputs = [ freetype fribidi ]
-    ++ optional encaSupport enca
+  buildInputs = [ freetype fribidi harfbuzz ]
     ++ optional fontconfigSupport fontconfig
-    ++ optional harfbuzzSupport harfbuzz
     ++ optional stdenv.isDarwin libiconv;
 
   meta = {