From 71b309169d484510b217b91dbd913eb33189a2ca Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 25 Nov 2021 18:52:46 -0500 Subject: profiles: Also handle package objects in GDK-PIXBUF-LOADERS-CACHE-FILE. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 --- guix/profiles.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'guix/profiles.scm') 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 -- cgit v1.2.3