[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
123/130: profiles: Add a gdk-pixbuf-loaders-cache-file hook.
From: |
guix-commits |
Subject: |
123/130: profiles: Add a gdk-pixbuf-loaders-cache-file hook. |
Date: |
Sat, 16 Oct 2021 02:36:49 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit f3d0662c0e8d9097119befe8e9076ff9718fa245
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sat Oct 2 21:28:24 2021 -0400
profiles: Add a gdk-pixbuf-loaders-cache-file hook.
This paves the way toward properly fixing https://issues.guix.gnu.org/50957.
* guix/profiles.scm (gdk-pixbuf-loaders-cache-file): Add procedure...
(%default-profile-hooks): ... and register it as a profile hook.
---
guix/profiles.scm | 30 +++++++++++++++++++++++++++++-
1 file changed, 29 insertions(+), 1 deletion(-)
diff --git a/guix/profiles.scm b/guix/profiles.scm
index 9494684..83f589c 100644
--- a/guix/profiles.scm
+++ b/guix/profiles.scm
@@ -7,7 +7,7 @@
;;; Copyright © 2016, 2018, 2019, 2021 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 Chris Marusich <cmmarusich@gmail.com>
;;; Copyright © 2017 Huang Ying <huang.ying.caritas@gmail.com>
-;;; Copyright © 2017 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2017, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2019 Kyle Meyer <kyle@kyleam.com>
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2020 Danny Milosavljevic <dannym@scratchpost.org>
@@ -1161,6 +1161,33 @@ MANIFEST. Single-file bundles are required by programs
such as Git and Lynx."
`((type . profile-hook)
(hook . emacs-subdirs))))
+(define (gdk-pixbuf-loaders-cache-file manifest)
+ "Return a derivation that produces a loaders cache file for every gdk-pixbuf
+loaders discovered in MANIFEST."
+ (define gdk-pixbuf ;lazy reference
+ (module-ref (resolve-interface '(gnu packages gtk)) 'gdk-pixbuf))
+
+ (mlet %store-monad ((%gdk-pixbuf (manifest-lookup-package
+ manifest "gdk-pixbuf"))
+ (gdk-pixbuf-query-loaders
+ -> (file-append gdk-pixbuf
+ "/bin/gdk-pixbuf-query-loaders")))
+ (define build
+ (with-imported-modules (source-module-closure
+ '((guix build glib-or-gtk-build-system)))
+ #~(begin
+ (use-modules (guix build glib-or-gtk-build-system))
+ (generate-gdk-pixbuf-loaders-cache '#$(manifest-inputs manifest)
+ (list #$output)))))
+ (if %gdk-pixbuf
+ (gexp->derivation "gdk-pixbuf-loaders-cache-file" build
+ #:local-build? #t
+ #:substitutable? #f
+ #:properties
+ '((type . profile-hook)
+ (hook . gdk-pixbuf-loaders-cache-file)))
+ (return #f))))
+
(define (glib-schemas manifest)
"Return a derivation that unions all schemas from manifest entries and
creates the Glib 'gschemas.compiled' file."
@@ -1672,6 +1699,7 @@ the entries in MANIFEST."
ghc-package-cache-file
ca-certificate-bundle
emacs-subdirs
+ gdk-pixbuf-loaders-cache-file
glib-schemas
gtk-icon-themes
gtk-im-modules
- 95/130: gnu: Move a few Python packages to (gnu packages python-build)., (continued)
- 95/130: gnu: Move a few Python packages to (gnu packages python-build)., guix-commits, 2021/10/16
- 94/130: gnu: fontconfig: Add a search path for XDG_DATA_DIRS., guix-commits, 2021/10/16
- 98/130: gnu: Add python-tomli., guix-commits, 2021/10/16
- 105/130: gnu: at-spi2-core: Reverse inheritance relationship with minimal variant., guix-commits, 2021/10/16
- 107/130: gnu: json-glib-minimal: Introduce minimal variant., guix-commits, 2021/10/16
- 106/130: gnu: at-spi2-atk: Break a dependency cycle between GTK+ and Inkscape., guix-commits, 2021/10/16
- 108/130: gnu: colord-minimal: Introduce minimal variant., guix-commits, 2021/10/16
- 113/130: gnu: mesa: Update to 21.2.4., guix-commits, 2021/10/16
- 115/130: gnu: lsof: Disable the LTlock test., guix-commits, 2021/10/16
- 116/130: gnu: lsof: Fix indentation., guix-commits, 2021/10/16
- 123/130: profiles: Add a gdk-pixbuf-loaders-cache-file hook.,
guix-commits <=
- 126/130: gnu: glib: Update to 2.70, specify a bindir prefix and hide package., guix-commits, 2021/10/16
- 128/130: gnu: libthai: Make datrie a normal native-input., guix-commits, 2021/10/16
- 130/130: gnu: gtk: Add the generate-gdk-pixbuf-loaders-cache-file phase., guix-commits, 2021/10/16
- 70/130: gnu: python-keras: Enable parallel tests., guix-commits, 2021/10/16
- 129/130: gnu: glib-networking: Update to 2.70.rc., guix-commits, 2021/10/16
- 86/130: gnu: gdb: Patch references to /bin/sh and add debug output., guix-commits, 2021/10/16
- 104/130: build: glib-or-gtk-build-system: Fix indentation., guix-commits, 2021/10/16
- 99/130: gnu: python-setuptools-scm: Update to 6.3.2, guix-commits, 2021/10/16
- 120/130: gnu: util-linux: Globally disable the lsns test., guix-commits, 2021/10/16
- 121/130: gnu: heimdal: Fix build., guix-commits, 2021/10/16