summary refs log tree commit diff
path: root/pkgs/tools/typesetting/tex
diff options
context:
space:
mode:
authorLeo Gaskin <leo.gaskin@le0.gs>2021-05-02 22:03:02 +0200
committerLeo Gaskin <leo.gaskin@le0.gs>2021-05-02 22:05:29 +0200
commitf4ec650cdea7cb398de5fb654096590763c21bdc (patch)
tree9d3c43681652266bbb41f134d20b7d479dd40300 /pkgs/tools/typesetting/tex
parentdbc6e67bb3790949fb8394ad36fd946b34beceb9 (diff)
downloadnixpkgs-f4ec650cdea7cb398de5fb654096590763c21bdc.tar
nixpkgs-f4ec650cdea7cb398de5fb654096590763c21bdc.tar.gz
nixpkgs-f4ec650cdea7cb398de5fb654096590763c21bdc.tar.bz2
nixpkgs-f4ec650cdea7cb398de5fb654096590763c21bdc.tar.lz
nixpkgs-f4ec650cdea7cb398de5fb654096590763c21bdc.tar.xz
nixpkgs-f4ec650cdea7cb398de5fb654096590763c21bdc.tar.zst
nixpkgs-f4ec650cdea7cb398de5fb654096590763c21bdc.zip
texlive.bin.dvisvgm: Use version provided by TeXLive
The dvisvgm version provided by TeXLive now includes the fixes
mentioned in the attached issue and thus can be used again instead of
relying on upstream sources.
Diffstat (limited to 'pkgs/tools/typesetting/tex')
-rw-r--r--pkgs/tools/typesetting/tex/texlive/bin.nix19
1 files changed, 9 insertions, 10 deletions
diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix
index 0c496318e48..1c3d5929636 100644
--- a/pkgs/tools/typesetting/tex/texlive/bin.nix
+++ b/pkgs/tools/typesetting/tex/texlive/bin.nix
@@ -244,18 +244,17 @@ chktex = stdenv.mkDerivation {
 
 dvisvgm = stdenv.mkDerivation rec {
   pname = "texlive-dvisvgm.bin";
-  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";
-  };
+  inherit version;
+
+  inherit (common) src;
+
+  preConfigure = "cd texk/dvisvgm";
+
+  configureFlags = common.configureFlags
+    ++ [ "--with-system-kpathsea" ];
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ core/*kpathsea*/ brotli ghostscript zlib freetype woff2 potrace xxHash ];
+  buildInputs = [ core brotli ghostscript zlib freetype woff2 potrace xxHash ];
 
   enableParallelBuilding = true;
 };