Merge branch 'master' into core-updates

1 files changed, 28 insertions, 23 deletions

diff --git a/guix/build/texlive-build-system.scm b/guix/build/texlive-build-system.scm
index c1fd9fd9af..c0f262a5c0 100644
--- a/guix/build/texlive-build-system.scm
+++ b/guix/build/texlive-build-system.scm
@@ -19,7 +19,9 @@
 (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)
   #:use-module (srfi srfi-26)
   #:export (%standard-phases
@@ -38,31 +40,34 @@
                   (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
-             (find-files "." "\\.ins$"))))
+             (scandir "." (cut string-suffix? ".ins" <>)))))
 
 (define* (install #:key outputs tex-directory #:allow-other-keys)
   (let* ((out (assoc-ref outputs "out"))
@@ -76,7 +81,7 @@
 
 (define %standard-phases
   (modify-phases gnu:%standard-phases
-    (delete 'configure)
+    (replace 'configure configure)
     (replace 'build build)
     (delete 'check)
     (replace 'install install)))