ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 23:46:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

build-system: texlive: Build union in configure phase.

Browse source 
This allows us to use texmf.cnf instead of having to set all required
environment variables manually.

* guix/build/texlive-build-system.scm (configure): New procedure.
(build): Simplify.
(%standard-phases): Add configure phase.
* guix/build-system/texlive.scm (texlive-build): Include (guix build union) in
modules.
(%texlive-build-system-modules): Likewise.
This commit is contained in:
Ricardo Wurmus 2017-07-02 15:21:52 +02:00
parent 1678be097b
commit bb3b35975c
No known key found for this signature in database
GPG key ID: 197A5888235FACAC
2 changed files with 28 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
guix/build-system/texlive.scm
View file

@ -55,6 +55,7 @@ (define (texlive-ref component id)
(define %texlive-build-system-modules
;; Build-side modules imported by default.
`((guix build texlive-build-system)
(guix build union)
,@%gnu-build-system-modules))
(define (default-texlive-bin)
@ -114,6 +115,7 @@ (define* (texlive-build store name inputs
(substitutable? #t)
(imported-modules %texlive-build-system-modules)
(modules '((guix build texlive-build-system)
(guix build union)
(guix build utils))))
"Build SOURCE with INPUTS."
(define builder

48
guix/build/texlive-build-system.scm
View file

@ -19,6 +19,7 @@
(define-module (guix build texlive-build-system)
#:use-module ((guix build gnu-build-system) #:prefix gnu:)
#:use-module (guix build utils)
#:use-module (guix build union)
#:use-module (ice-9 match)
#:use-module (ice-9 ftw)
#:use-module (srfi srfi-1)
@ -39,28 +40,31 @@ (define (compile-with-latex format file)
(string-append "&" format)
file)))
(define* (build #:key inputs build-targets tex-format #:allow-other-keys)
;; Find additional tex and sty files
(setenv "TEXINPUTS"
(string-append
(getcwd) ":" (getcwd) "/build:"
(string-join
(append-map (match-lambda
((_ . dir)
(find-files dir
(lambda (_ stat)
(eq? 'directory (stat:type stat)))
#:directories? #t
#:stat stat)))
inputs)
":")))
(setenv "TEXFORMATS"
(string-append (assoc-ref inputs "texlive-latex-base")
"/share/texmf-dist/web2c/"))
(setenv "LUAINPUTS"
(string-append (assoc-ref inputs "texlive-latex-base")
"/share/texmf-dist/tex/latex/base/"))
(define* (configure #:key inputs #:allow-other-keys)
(let* ((out (string-append (getcwd) "/.texlive-union"))
(texmf.cnf (string-append out "/share/texmf-dist/web2c/texmf.cnf")))
;; Build a modifiable union of all inputs (but exclude bash)
(match inputs
(((names . directories) ...)
(union-build out directories
#:create-all-directories? #t
#:log-port (%make-void-port "w"))))
;; The configuration file "texmf.cnf" is provided by the
;; "texlive-bin" package. We take it and override only the
;; setting for TEXMFROOT and TEXMF. This file won't be consulted
;; by default, though, so we still need to set TEXMFCNF.
(substitute* texmf.cnf
(("^TEXMFROOT = .*")
(string-append "TEXMFROOT = " out "/share\n"))
(("^TEXMF = .*")
"TEXMF = $TEXMFROOT/share/texmf-dist\n"))
(setenv "TEXMFCNF" (dirname texmf.cnf))
(setenv "TEXMF" (string-append out "/share/texmf-dist")))
(mkdir "build")
#t)
(define* (build #:key inputs build-targets tex-format #:allow-other-keys)
(every (cut compile-with-latex tex-format <>)
(if build-targets build-targets
(scandir "." (cut string-suffix? ".ins" <>)))))
@ -77,7 +81,7 @@ (define* (install #:key outputs tex-directory #:allow-other-keys)
(define %standard-phases
(modify-phases gnu:%standard-phases
(delete 'configure)
(replace 'configure configure)
(replace 'build build)
(delete 'check)
(replace 'install install)))