Unverified Commit dd48a8a8 authored by Vincenzo Mantova's avatar Vincenzo Mantova Committed by GitHub
Browse files

texlive.pkgs.tex4ebook: add html-tidy to PATH (#266861)

parent dca8bf97

pkgs/tools/typesetting/tex/texlive/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
, callPackage, ghostscript_headless, harfbuzz

, makeWrapper, installShellFiles

, python3, ruby, perl, tk, jdk, bash, snobol4

, coreutils, findutils, gawk, getopt, gnugrep, gnumake, gnupg, gnused, gzip, ncurses, zip

, coreutils, findutils, gawk, getopt, gnugrep, gnumake, gnupg, gnused, gzip, html-tidy, ncurses, zip

, libfaketime, asymptote, biber-ms, makeFontsConf

, useFixedHashes ? true

, recurseIntoAttrs
@@ -33,7 +33,7 @@ let 
        stdenv lib bin tlpdb tlpdbxz tl

        installShellFiles

        coreutils findutils gawk getopt ghostscript_headless gnugrep

        gnumake gnupg gnused gzip ncurses perl python3 ruby zip;

        gnumake gnupg gnused gzip html-tidy ncurses perl python3 ruby zip;

    };

  in overrides tlpdb;

pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix

+6 −1
Original line number Diff line number Diff line 
{ stdenv, lib, tlpdb, bin, tlpdbxz, tl

, installShellFiles

, coreutils, findutils, gawk, getopt, ghostscript_headless, gnugrep

, gnumake, gnupg, gnused, gzip, ncurses, perl, python3, ruby, zip

, gnumake, gnupg, gnused, gzip, html-tidy, ncurses, perl, python3, ruby, zip

}:



oldTlpdb:
@@ -88,6 +88,7 @@ in lib.recursiveUpdate orig rec { 
  pkfix-helper.extraBuildInputs = [ ghostscript_headless ];

  ps2eps.extraBuildInputs = [ ghostscript_headless ];

  pst2pdf.extraBuildInputs = [ ghostscript_headless ];

  tex4ebook.extraBuildInputs = [ html-tidy ];

  tex4ht.extraBuildInputs = [ ruby ];

  texlive-scripts.extraBuildInputs = [ gnused ];

  texlive-scripts-extra.extraBuildInputs = [ coreutils findutils ghostscript_headless gnused ];
@@ -241,6 +242,10 @@ in lib.recursiveUpdate orig rec { 
    sed -i '2i$ENV{PATH}='"'"'${lib.makeBinPath pst2pdf.extraBuildInputs}'"'"' . ($ENV{PATH} ? ":$ENV{PATH}" : '"'''"');' "$out"/bin/pst2pdf

  '';



  tex4ebook.postFixup = ''

    sed -i '2ios.setenv("PATH","${lib.makeBinPath tex4ebook.extraBuildInputs}" .. (os.getenv("PATH") and ":" .. os.getenv("PATH") or ""))' "$out"/bin/tex4ebook

  '';



  tex4ht.postFixup = ''

    sed -i -e '2iPATH="${lib.makeBinPath tex4ht.extraBuildInputs}''${PATH:+:$PATH}"' -e 's/\\rubyCall//g;' "$out"/bin/htcontext

  '';