01/04: profiles: Also handle package objects in GDK-PIXBUF-LOADERS-CACHE-FILE.

[guix-commits]

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

commit 71b309169d484510b217b91dbd913eb33189a2ca
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Thu Nov 25 18:52:46 2021 -0500

    profiles: Also handle package objects in GDK-PIXBUF-LOADERS-CACHE-FILE.
    
    * guix/profiles.scm (gdk-pixbuf-loaders-cache-file): Handle both a string 
or a
    package object for GDK-PIXBUF, as these are the two types that can be 
returned
    by MANIFEST-LOOKUP-PACKAGE.
    
    Suggested-by: Ludovic Courtès <ludo@gnu.org>
---
 guix/profiles.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/guix/profiles.scm b/guix/profiles.scm
index 2ee44ff..1d354ec 100644
--- a/guix/profiles.scm
+++ b/guix/profiles.scm
@@ -1189,7 +1189,9 @@ loaders discovered in MANIFEST."
   (mlet* %store-monad
       ((gdk-pixbuf (manifest-lookup-package manifest "gdk-pixbuf"))
        (librsvg (manifest-lookup-package manifest "librsvg"))
-       (gdk-pixbuf-bin -> (string-append gdk-pixbuf "/bin")))
+       (gdk-pixbuf-bin -> (if (string? gdk-pixbuf)
+                              (string-append gdk-pixbuf "/bin")
+                              (file-append gdk-pixbuf "/bin"))))
 
     (define build
       (with-imported-modules (source-module-closure