~ruther/guix-local: profiles: Also handle package objects in GDK-PIXBUF-LOADERS-CACHE-FILE.

71b309169d484510b217b91dbd913eb33189a2ca — Maxim Cournoyer 4 years ago 138498f

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>

patch browse .tar.gz .zip

1 files changed, 3 insertions(+), 1 deletions(-)

M guix/profiles.scm

M guix/profiles.scm => guix/profiles.scm +3 -1

@@ 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