libass: remove enca as dependency
Enca support was dropped in 0.13.0: 6fc9855dac/Changelog (L184)
This also fixes cross-compilation, since enca didn't cross-compile.
This commit is contained in:
parent
ed10a3f12c
commit
3ff9e941eb
|
@ -1,13 +1,11 @@
|
||||||
{ lib, stdenv, fetchurl, pkg-config, yasm
|
{ lib, stdenv, fetchurl, pkg-config, yasm
|
||||||
, freetype, fribidi, harfbuzz
|
, freetype, fribidi, harfbuzz
|
||||||
, encaSupport ? true, enca ? null # enca support
|
|
||||||
, fontconfigSupport ? true, fontconfig ? null # fontconfig support
|
, fontconfigSupport ? true, fontconfig ? null # fontconfig 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
|
||||||
}:
|
}:
|
||||||
|
|
||||||
assert encaSupport -> enca != null;
|
|
||||||
assert fontconfigSupport -> fontconfig != null;
|
assert fontconfigSupport -> fontconfig != null;
|
||||||
|
|
||||||
let
|
let
|
||||||
|
@ -25,7 +23,6 @@ stdenv.mkDerivation rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
(mkFlag encaSupport "enca")
|
|
||||||
(mkFlag fontconfigSupport "fontconfig")
|
(mkFlag fontconfigSupport "fontconfig")
|
||||||
(mkFlag rasterizerSupport "rasterizer")
|
(mkFlag rasterizerSupport "rasterizer")
|
||||||
(mkFlag largeTilesSupport "large-tiles")
|
(mkFlag largeTilesSupport "large-tiles")
|
||||||
|
@ -34,7 +31,6 @@ stdenv.mkDerivation rec {
|
||||||
nativeBuildInputs = [ pkg-config yasm ];
|
nativeBuildInputs = [ pkg-config yasm ];
|
||||||
|
|
||||||
buildInputs = [ freetype fribidi harfbuzz ]
|
buildInputs = [ freetype fribidi harfbuzz ]
|
||||||
++ optional encaSupport enca
|
|
||||||
++ optional fontconfigSupport fontconfig
|
++ optional fontconfigSupport fontconfig
|
||||||
++ optional stdenv.isDarwin libiconv;
|
++ optional stdenv.isDarwin libiconv;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue