ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-17 20:27:36 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
* 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>
This commit is contained in:
Maxim Cournoyer 2021-11-25 18:52:46 -05:00
parent 138498feec
commit 71b309169d
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
guix/profiles.scm
View file

@ -1189,7 +1189,9 @@ (define gdk-pixbuf ;lazy reference
(mlet* %store-monad (mlet* %store-monad
((gdk-pixbuf (manifest-lookup-package manifest "gdk-pixbuf")) ((gdk-pixbuf (manifest-lookup-package manifest "gdk-pixbuf"))
(librsvg (manifest-lookup-package manifest "librsvg")) (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 (define build
(with-imported-modules (source-module-closure (with-imported-modules (source-module-closure