diff options
| author | Thiago Jung Bauermann <bauermann@kolabnow.com> | 2021-07-04 21:00:59 -0300 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2021-07-21 15:55:26 +0200 |
| commit | 04e80290bf1023f83649f807ddcd4d980da1747b (patch) | |
| tree | 4048ef8031f451dccd3a80bf4316698fa533ad4f /gnu/packages | |
| parent | 777962de5ec4a8b0d57fcd745cf6e4b05689b582 (diff) | |
| download | guix-04e80290bf1023f83649f807ddcd4d980da1747b.tar guix-04e80290bf1023f83649f807ddcd4d980da1747b.tar.gz | |
gnu: TeX Live: Use IniTeX to build a couple of packages
The package texlive-latex-base in TeX Live 2021 will depend on
texlive-latex-l3kernel and texlive-latex-l3packages. Therefore we need to
remove their build dependency on texlive-latex-base to avoid a circular
dependency.
l3kernel and l3packages don’t need LaTeX during build, just IniTeX.
So to make them use it, modify texlive-build-system to allow disabling
the #:texlive-latex-base and #:tex-format parameters, and also add
a #:tex-engine parameter.
We also need to add texlive-docstrip as a native input, which was
previously provided by texlive-latex-base.
* gnu/packages/tex.scm (texlive-latex-l3kernel,
texlive-latex-l3packages)[arguments]: Add ‘#:tex-engine’, ‘#:tex-format’
and ‘#:texlive-latex-base’ parameters.
[native-inputs]: Add ‘texlive-docstrip’.
* guix/build-system/texlive.scm (lower)[build-inputs]: Don’t add
‘texlive-latex-base’ if its keyword parameter is false.
(texlive-build): Add ‘tex-engine’ keyword parameter.
[builder]: If a ‘tex-engine’ parameter was passed, use it. Otherwise, use
‘tex-format’ as the engine.
* guix/build/texlive-build-system.scm (compile-with-latex): Add ‘engine’
parameter. If the ‘format’ parameter is false, add “-ini” option to the
command line.
(build): Add ‘tex-engine’ parameter. Pass it down to ‘compile-with-latex’.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/tex.scm | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 16086263e3..eb433a23ab 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -19,6 +19,7 @@ ;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz> ;;; Copyright © 2021 Ivan Gankevich <i.gankevich@spbu.ru> ;;; Copyright © 2021 Julien Lepiller <julien@lepiller.eu> +;;; Copyright © 2021 Thiago Jung Bauermann <bauermann@kolabnow.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -3387,7 +3388,12 @@ Live distribution.") "0w82d5a4d3rc950ms6ymj4mpw5ndz6qs5x53szcfgzgjxsns9l4w")))) (build-system texlive-build-system) (arguments - '(#:tex-directory "latex/l3kernel")) + '(#:tex-directory "latex/l3kernel" + #:tex-engine "tex" + #:tex-format #f + #:texlive-latex-base #f)) + (native-inputs + `(("texlive-docstrip" ,texlive-docstrip))) (home-page "https://www.ctan.org/pkg/l3kernel") (synopsis "LaTeX3 programmers’ interface") (description @@ -3412,6 +3418,9 @@ that the LaTeX3 conventions can be used with regular LaTeX 2e packages.") (build-system texlive-build-system) (arguments '(#:tex-directory "latex/l3packages" + #:tex-engine "tex" + #:tex-format #f + #:texlive-latex-base #f ;; build-targets must be specified manually since they are in ;; sub-directories. #:build-targets '("l3keys2e.ins" "xparse.ins" "xfrac.ins" "xfp.ins" "xtemplate.ins") @@ -3433,6 +3442,8 @@ that the LaTeX3 conventions can be used with regular LaTeX 2e packages.") ":"))) #t))) )) + (native-inputs + `(("texlive-docstrip" ,texlive-docstrip))) (propagated-inputs `(("texlive-latex-l3kernel" ,texlive-latex-l3kernel))) (home-page "https://www.ctan.org/pkg/l3packages") |