summaryrefslogtreecommitdiff
path: root/guix
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim.cournoyer@gmail.com>2021-11-25 18:52:46 -0500
committerMaxim Cournoyer <maxim.cournoyer@gmail.com>2021-11-25 20:44:16 -0500
commit71b309169d484510b217b91dbd913eb33189a2ca (patch)
tree4434674346ffa10df69ae4cedcb21893cc17b249 /guix
parent138498feec335f68935f00f8a97924c90c7f59b0 (diff)
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>
Diffstat (limited to 'guix')
-rw-r--r--guix/profiles.scm4
1 files changed, 3 insertions, 1 deletions
diff --git a/guix/profiles.scm b/guix/profiles.scm
index 2ee44ffe6e..1d354ecb78 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