summaryrefslogtreecommitdiff
path: root/guix/build-system
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/build-system
parent1678be097bb3f6403bbc4ab8414f3e7f02c70e44 (diff)
downloadgnu-guix-bb3b35975c61db3d1cb0d8522f80d139009e11a9.tar
gnu-guix-bb3b35975c61db3d1cb0d8522f80d139009e11a9.tar.gz
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/build-system')
-rw-r--r--guix/build-system/texlive.scm2
1 files changed, 2 insertions, 0 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