diff options
author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2020-11-30 15:38:28 -0500 |
---|---|---|
committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2020-11-30 15:38:28 -0500 |
commit | 9ef277209a5c7151da308244bbabc50b80864453 (patch) | |
tree | a0389f92c96333eafc2085a5679300a119e23d0a /pkgs/tools/typesetting | |
parent | 5420a929261beff7b300be574dd6106ab736aec2 (diff) |
texlive.bin.dvisvgm: texlive 2.8.1 -> upstream 2.11
Diffstat (limited to 'pkgs/tools/typesetting')
-rw-r--r-- | pkgs/tools/typesetting/tex/texlive/bin.nix | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index 672d5af68c806..030ac1b43aae7 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -4,7 +4,7 @@ , freetype, gd, libXaw, icu, ghostscript, libXpm, libXmu, libXext , perl, perlPackages, python2Packages, pkgconfig , poppler, libpaper, graphite2, zziplib, harfbuzz, potrace, gmp, mpfr -, cairo, pixman, xorg, clisp, biber, xxHash +, brotli, cairo, pixman, xorg, clisp, biber, woff2, xxHash , makeWrapper, shortenPerlShebang }: @@ -245,20 +245,20 @@ chktex = stdenv.mkDerivation { }; -dvisvgm = stdenv.mkDerivation { +dvisvgm = stdenv.mkDerivation rec { pname = "texlive-dvisvgm.bin"; - inherit version; - - inherit (common) src; + version = "2.11"; + # TODO: dvisvgm was switched to build from upstream sources + # to address https://github.com/NixOS/nixpkgs/issues/104847 + # We might want to consider reverting that change in the future. + + src = fetchurl { + url = "https://github.com/mgieseki/dvisvgm/releases/download/${version}/dvisvgm-${version}.tar.gz"; + sha256 = "12b6h0h8rc487yjh3sq9zsdabm9cs2vqcrb0znnfi8277f87zf3j"; + }; nativeBuildInputs = [ pkgconfig ]; - # TODO: dvisvgm still uses vendored dependencies - buildInputs = [ core/*kpathsea*/ ghostscript zlib freetype /*potrace xxHash*/ ]; - - preConfigure = "cd texk/dvisvgm"; - - configureFlags = common.configureFlags - ++ [ "--with-system-kpathsea" ]; + buildInputs = [ core/*kpathsea*/ brotli ghostscript zlib freetype woff2 potrace xxHash ]; enableParallelBuilding = true; }; |