summaryrefslogtreecommitdiff
path: root/guix
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2017-07-02 15:21:52 +0200
committerRicardo Wurmus <rekado@elephly.net>2017-07-09 17:07:27 +0200
commitbb3b35975c61db3d1cb0d8522f80d139009e11a9 (patch)
tree06ccac541cb5e9f28a9f078a56007c0a131de0a2 /guix
parent1678be097bb3f6403bbc4ab8414f3e7f02c70e44 (diff)
build-system: texlive: Build union in configure phase.
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.
Diffstat (limited to 'guix')
-rw-r--r--guix/build-system/texlive.scm2
-rw-r--r--guix/build/texlive-build-system.scm48
2 files changed, 28 insertions, 22 deletions
diff --git a/guix/build-system/texlive.scm b/guix/build-system/texlive.scm
index 0357c47a47..80882b144b 100644
--- a/guix/build-system/texlive.scm
+++ b/guix/build-system/texlive.scm
@@ -55,6 +55,7 @@ given Texlive COMPONENT."
(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 @@ given Texlive COMPONENT."
(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
diff --git a/guix/build/texlive-build-system.scm b/guix/build/texlive-build-system.scm
index 7b10198fd2..c0f262a5c0 100644
--- a/guix/build/texlive-build-system.scm
+++ b/guix/build/texlive-build-system.scm
@@ -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 @@
(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 %standard-phases
(modify-phases gnu:%standard-phases
- (delete 'configure)
+ (replace 'configure configure)
(replace 'build build)
(delete 'check)
(replace 'install install)))