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.
This commit is contained in:
Federico Beffa 2016-07-06 18:23:03 +02:00
parent 9a745d76f6
commit 2d634d9b7e
1 changed files with 13 additions and 1 deletions

View File

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