summaryrefslogtreecommitdiffstats
path: root/pkgs/tools/typesetting
diff options
context:
space:
mode:
authorDmitry Kalinkin <dmitry.kalinkin@gmail.com>2020-12-01 18:56:51 -0500
committerGitHub <noreply@github.com>2020-12-01 18:56:51 -0500
commitd527419584dd6323aab50fa0efc5412d84919956 (patch)
treebe3af06ec6cd325c51261c6b53a6553b9909ed0e /pkgs/tools/typesetting
parentb1d16d8101ba67d849ef15630d71c7e5bea3c68f (diff)
parent9ef277209a5c7151da308244bbabc50b80864453 (diff)
Merge pull request #105490 from veprbl/pr/dvisvgm_2_11
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.nix24
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 672d5af68c80..030ac1b43aae 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;
};