diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-12 12:00:55 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-12 12:00:55 +0000 |
| commit | 1b3033ebfb1e92c3166b75c7f820d066f3dd3665 (patch) | |
| tree | 77dac8b89ea940a62046ea26db0bdaa3a14faad7 /pkgs/tools/typesetting | |
| parent | 85abdfd32e1c46e46c47853297820de456628296 (diff) | |
| parent | 2709b7a1c6693cff8d5e44ccaf3f17385ed26d10 (diff) | |
| download | nixpkgs-1b3033ebfb1e92c3166b75c7f820d066f3dd3665.tar nixpkgs-1b3033ebfb1e92c3166b75c7f820d066f3dd3665.tar.gz nixpkgs-1b3033ebfb1e92c3166b75c7f820d066f3dd3665.tar.bz2 nixpkgs-1b3033ebfb1e92c3166b75c7f820d066f3dd3665.tar.lz nixpkgs-1b3033ebfb1e92c3166b75c7f820d066f3dd3665.tar.xz nixpkgs-1b3033ebfb1e92c3166b75c7f820d066f3dd3665.tar.zst nixpkgs-1b3033ebfb1e92c3166b75c7f820d066f3dd3665.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/typesetting')
| -rw-r--r-- | pkgs/tools/typesetting/tex/texlive/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index bb505f4062b..1a497c6affa 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -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; diff --git a/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix b/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix index e9b448dc430..83f07016bcd 100644 --- a/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix +++ b/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix @@ -1,7 +1,7 @@ { 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 ''; |