01/01: gnu: texlive: Fix 'texmf-local' search path.

[Federico Beffa]

beffa pushed a commit to branch core-updates
in repository guix.

commit 2d634d9b7e2c6aba45658c50cc5029a2a24bae85
Author: Federico Beffa <address@hidden>
Date:   Wed Jul 6 18:23:03 2016 +0200

    gnu: texlive: Fix 'texmf-local' search path.
    
    * gnu/packages/tex.scm (texlive, texlive-minimal): Add
      'native-search-paths'.
      (texlive-texmf): Correct 'TEXMFLOCAL' definition in 'texmf.cnf' in
      'texmf-config' phase.
---
 gnu/packages/tex.scm |   14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 219f685..2600b6f 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -4,6 +4,7 @@
 ;;; Copyright © 2015 Mark H Weaver <address@hidden>
 ;;; Copyright © 2016 Roel Janssen <address@hidden>
 ;;; Copyright © 2016 Efraim Flashner <address@hidden>
+;;; Copyright © 2016 Federico Beffa <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -206,7 +207,10 @@ This package contains the binaries.")
                 ;; Register SHARE as TEXMFROOT in texmf.cnf.
                 (substitute* texmfcnf
                   (("TEXMFROOT = \\$SELFAUTOPARENT")
-                  (string-append "TEXMFROOT = " share)))
+                   (string-append "TEXMFROOT = " share))
+                  (("TEXMFLOCAL = \\$SELFAUTOGRANDPARENT/texmf-local")
+                   "TEXMFLOCAL = $SELFAUTODIR/share/texmf-local")
+                  (("!!\\$TEXMFLOCAL") "$TEXMFLOCAL"))
                 ;; Register paths in texmfcnf.lua, needed for context.
                 (substitute* (string-append texmfroot "/texmfcnf.lua")
                   (("selfautodir:") out)
@@ -242,6 +246,10 @@ This package contains the complete tree of texmf-dist 
data.")
    (inputs `(("bash" ,bash) ; for wrap-program
              ("texlive-bin" ,texlive-bin)
              ("texlive-texmf" ,texlive-texmf)))
+   (native-search-paths
+    (list (search-path-specification
+           (variable "TEXMFLOCAL")
+           (files '("share/texmf-local")))))
    (arguments
     `(#:modules ((guix build utils))
       #:builder
@@ -353,6 +361,10 @@ This package contains a small subset of the texmf-dist 
data.")))
    (inputs
     `(("texlive-texmf" ,texlive-texmf-minimal)
       ,@(alist-delete "texlive-texmf" (package-inputs texlive))))
+   (native-search-paths
+    (list (search-path-specification
+           (variable "TEXMFLOCAL")
+           (files '("share/texmf-local")))))
    (description
     "TeX Live provides a comprehensive TeX document production system.
 It includes all the major TeX-related programs, macro packages, and fonts