me/guix
Archived
1
0
Fork 0
Code Activity

profiles: 'texlive-font-maps' gracefully handles lack of texlive inputs.

Browse source 
Fixes <https://issues.guix.gnu.org/63043>.

* guix/profiles.scm (texlive-font-maps): Define 'texlive-inputs'.
[build]: Use it.
Return #f when TEXLIVE-INPUTS is empty.
This commit is contained in:
Ludovic Courtès 2023-05-04 12:43:53 +02:00
parent 25f04945d9
commit 916c6e5716
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
guix/profiles.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013-2022 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013-2023 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org> ;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright © 2014, 2016 Alex Kost <alezost@gmail.com> ;;; Copyright © 2014, 2016 Alex Kost <alezost@gmail.com>
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
@ -1787,6 +1787,8 @@ MANIFEST."
(cons (gexp-input thing output) (cons (gexp-input thing output)
(append-map entry->texlive-input deps)) (append-map entry->texlive-input deps))
'())))) '()))))
(define texlive-inputs
(append-map entry->texlive-input (manifest-entries manifest)))
(define texlive-bin (define texlive-bin
(module-ref (resolve-interface '(gnu packages tex)) 'texlive-bin)) (module-ref (resolve-interface '(gnu packages tex)) 'texlive-bin))
(define coreutils (define coreutils
@ -1810,8 +1812,7 @@ MANIFEST."
;; that TeX live can resolve the parent and grandparent directories ;; that TeX live can resolve the parent and grandparent directories
;; correctly. There might be a more elegant way to accomplish this. ;; correctly. There might be a more elegant way to accomplish this.
(union-build "/tmp/texlive" (union-build "/tmp/texlive"
'#$(append-map entry->texlive-input '#$texlive-inputs
(manifest-entries manifest))
#:create-all-directories? #t #:create-all-directories? #t
#:log-port (%make-void-port "w")) #:log-port (%make-void-port "w"))
@ -1868,7 +1869,7 @@ MANIFEST."
(install-file (string-append b "/ls-R") a)))))) (install-file (string-append b "/ls-R") a))))))
(mlet %store-monad ((texlive-base (manifest-lookup-package manifest "texlive-base"))) (mlet %store-monad ((texlive-base (manifest-lookup-package manifest "texlive-base")))
(if texlive-base (if (and texlive-base (pair? texlive-inputs))
(gexp->derivation "texlive-font-maps" build (gexp->derivation "texlive-font-maps" build
#:substitutable? #f #:substitutable? #f
#:local-build? #t #:local-build? #t