From 7582e6fea6f7d897ac78652ceea8d275db2e39ba Mon Sep 17 00:00:00 2001 From: Vincenzo Mantova <1962985+xworld21@users.noreply.github.com> Date: Tue, 22 Aug 2023 16:03:55 +0100 Subject: texlive: add extraNativeBuildInputs parameter to bin containers --- pkgs/tools/typesetting/tex/texlive/build-texlive-package.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pkgs/tools/typesetting/tex/texlive') diff --git a/pkgs/tools/typesetting/tex/texlive/build-texlive-package.nix b/pkgs/tools/typesetting/tex/texlive/build-texlive-package.nix index 1415d2d39f9f..2e9572f168a5 100644 --- a/pkgs/tools/typesetting/tex/texlive/build-texlive-package.nix +++ b/pkgs/tools/typesetting/tex/texlive/build-texlive-package.nix @@ -29,6 +29,7 @@ , hasManpages ? false , hasRunfiles ? false , hasTlpkg ? false +, extraNativeBuildInputs ? [ ] , ... }@args: @@ -119,6 +120,7 @@ let inherit meta; # shebang interpreters buildInputs = (args.extraBuildInputs or [ ]) ++ [ bash perl ] ++ (lib.attrVals (args.scriptExts or [ ]) extToInput); + nativeBuildInputs = extraNativeBuildInputs; # absolute scripts folder scriptsFolder = lib.optionalString (run ? outPath) (run.outPath + "/scripts/" + args.scriptsFolder or pname); # binaries info -- cgit 1.4.1 From 65923600fec7fa56ad428605f2af4dd4090de327 Mon Sep 17 00:00:00 2001 From: Vincenzo Mantova <1962985+xworld21@users.noreply.github.com> Date: Tue, 22 Aug 2023 16:03:55 +0100 Subject: texdoc: install zsh completion --- pkgs/tools/typesetting/tex/texlive/default.nix | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'pkgs/tools/typesetting/tex/texlive') diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 9839d764adf4..24bdf205669a 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -4,7 +4,7 @@ */ { stdenv, lib, fetchurl, runCommand, writeText, buildEnv , callPackage, ghostscript_headless, harfbuzz -, makeWrapper +, makeWrapper, installShellFiles , python3, ruby, perl, tk, jdk, bash, snobol4 , coreutils, findutils, gawk, getopt, gnugrep, gnumake, gnupg, gnused, gzip, ncurses, zip , libfaketime, asymptote, biber-ms, makeFontsConf @@ -376,6 +376,8 @@ let extraRevision = "-tlpdb${toString tlpdbVersion.revision}"; extraVersion = "-tlpdb-${toString tlpdbVersion.revision}"; + extraNativeBuildInputs = [ installShellFiles ]; + # build Data.tlpdb.lua (part of the 'tlType == "run"' package) postUnpack = '' if [[ -f "$out"/scripts/texdoc/texdoc.tlu ]]; then @@ -392,6 +394,18 @@ let cp texdoc/cache-tlpdb.lua "$out"/scripts/texdoc/Data.tlpdb.lua fi ''; + + # install zsh completion + postFixup = '' + TEXMFCNF="${bin.core}"/share/texmf-dist/web2c TEXMF="$scriptsFolder/../.." \ + texlua "$out"/bin/texdoc --print-completion zsh > "$TMPDIR"/_texdoc + substituteInPlace "$TMPDIR"/_texdoc \ + --replace 'compdef __texdoc texdoc' '#compdef texdoc' \ + --replace '$(kpsewhich -var-value TEXMFROOT)/tlpkg/texlive.tlpdb' '$(kpsewhich Data.tlpdb.lua)' \ + --replace '/^name[^.]*$/ {print $2}' '/^ \["[^"]*"\] = {$/ { print substr($1,3,length($1)-4) }' + echo '__texdoc' >> "$TMPDIR"/_texdoc + installShellCompletion --zsh "$TMPDIR"/_texdoc + ''; }; "texlive.infra" = { -- cgit 1.4.1