branch master updated: guix: Build texlive-configuration only when texlive-base is present.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

rekado pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new bd8e762  guix: Build texlive-configuration only when texlive-base is 
present.
bd8e762 is described below

commit bd8e7621b880c529cc69102bd6817d79257526ee
Author: Ricardo Wurmus <rekado@elephly.net>
AuthorDate: Thu May 20 16:26:46 2021 +0200

    guix: Build texlive-configuration only when texlive-base is present.
    
    Fixes <https://bugs.gnu.org/48519>.
    
    * guix/profiles.scm (texlive-configuration): Build only if texlive-base is
    present in the profile's manifest.
---
 guix/profiles.scm | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/guix/profiles.scm b/guix/profiles.scm
index 0044851..ca997a7 100644
--- a/guix/profiles.scm
+++ b/guix/profiles.scm
@@ -1745,16 +1745,15 @@ MANIFEST."
                                        maproot "updmap/pdftex/")))))
           #t)))
 
-    (with-monad %store-monad
-      (if (any (cut string-prefix? "texlive-" <>)
-               (map manifest-entry-name (manifest-entries manifest)))
-          (gexp->derivation "texlive-configuration" build
-                            #:substitutable? #f
-                            #:local-build? #t
-                            #:properties
-                            `((type . profile-hook)
-                              (hook . texlive-configuration)))
-          (return #f))))
+  (mlet %store-monad ((texlive-base (manifest-lookup-package manifest 
"texlive-base")))
+    (if texlive-base
+        (gexp->derivation "texlive-configuration" build
+                          #:substitutable? #f
+                          #:local-build? #t
+                          #:properties
+                          `((type . profile-hook)
+                            (hook . texlive-configuration)))
+        (return #f))))
 
 (define %default-profile-hooks
   ;; This is the list of derivation-returning procedures that are called by