From 3ff9e941ebf210082483e459efa917e66a99ca48 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Fri, 21 May 2021 21:07:18 +0200 Subject: [PATCH] libass: remove enca as dependency Enca support was dropped in 0.13.0: https://github.com/libass/libass/blob/6fc9855dac44699242ded580040838da032c3a9d/Changelog#L184 This also fixes cross-compilation, since enca didn't cross-compile. --- pkgs/development/libraries/libass/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/development/libraries/libass/default.nix index 3a8c2a2655ac..afc99220534f 100644 --- a/pkgs/development/libraries/libass/default.nix +++ b/pkgs/development/libraries/libass/default.nix @@ -1,13 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, yasm , freetype, fribidi, harfbuzz -, encaSupport ? true, enca ? null # enca support , fontconfigSupport ? true, fontconfig ? null # fontconfig support , rasterizerSupport ? false # Internal rasterizer , largeTilesSupport ? false # Use larger tiles in the rasterizer , libiconv }: -assert encaSupport -> enca != null; assert fontconfigSupport -> fontconfig != null; let @@ -25,7 +23,6 @@ stdenv.mkDerivation rec { }; configureFlags = [ - (mkFlag encaSupport "enca") (mkFlag fontconfigSupport "fontconfig") (mkFlag rasterizerSupport "rasterizer") (mkFlag largeTilesSupport "large-tiles") @@ -34,7 +31,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config yasm ]; buildInputs = [ freetype fribidi harfbuzz ] - ++ optional encaSupport enca ++ optional fontconfigSupport fontconfig ++ optional stdenv.isDarwin libiconv;