[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
138/149: profiles: Add a gdk-pixbuf-loaders-cache-file hook.
From: |
guix-commits |
Subject: |
138/149: profiles: Add a gdk-pixbuf-loaders-cache-file hook. |
Date: |
Tue, 26 Oct 2021 23:52:43 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit 82f458cf100704b83435aafc8bdb4b9d0e3a545b
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 | 29 ++++++++++++++++++++++++++++-
1 file changed, 28 insertions(+), 1 deletion(-)
diff --git a/guix/profiles.scm b/guix/profiles.scm
index 9494684..bdc0d52 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,32 @@ 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-bin -> (file-append gdk-pixbuf "/bin")))
+ (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))
+ (setenv "PATH" (string-append #$gdk-pixbuf-bin ":" (getenv
"PATH")))
+ (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 +1698,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
- 105/149: gnu: at-spi2-core: Reverse inheritance relationship with minimal variant., (continued)
- 105/149: gnu: at-spi2-core: Reverse inheritance relationship with minimal variant., guix-commits, 2021/10/26
- 107/149: gnu: lsof: Disable the LTlock test., guix-commits, 2021/10/26
- 109/149: gnu: json-glib-minimal: Introduce minimal variant., guix-commits, 2021/10/26
- 111/149: gnu: colord-minimal: Introduce minimal variant., guix-commits, 2021/10/26
- 121/149: gnu: util-linux: Globally disable the lsns test., guix-commits, 2021/10/26
- 117/149: gnu: graphviz: Update to 2.49.0., guix-commits, 2021/10/26
- 122/149: gnu: heimdal: Fix build., guix-commits, 2021/10/26
- 120/149: gnu: mit-krb5: Absorb 1.19.2 graft., guix-commits, 2021/10/26
- 129/149: gnu: libsoup: Update to 3.0.1., guix-commits, 2021/10/26
- 135/149: gnu: ungoogled-chromium: Use the new lld-as-ld-wrapper., guix-commits, 2021/10/26
- 138/149: profiles: Add a gdk-pixbuf-loaders-cache-file hook.,
guix-commits <=
- 88/149: guix: packages: Fix repacking of plain tarballs., guix-commits, 2021/10/26
- 100/149: gnu: python-pytest-6: Fix version via setuptools-scm., guix-commits, 2021/10/26
- 103/149: build: glib-or-gtk-build-system: Simplify the wrap-all-programs phase., guix-commits, 2021/10/26
- 112/149: gnu: libcloudproviders-minimal: Introduce minimal variant., guix-commits, 2021/10/26
- 123/149: gnu: pango: Update to 1.48.10., guix-commits, 2021/10/26
- 128/149: gnu: libsoup: Reverse inheritance relationship with libsoup-minimal., guix-commits, 2021/10/26
- 136/149: gnu: gtk: Add the generate-gdk-pixbuf-loaders-cache-file phase., guix-commits, 2021/10/26
- 137/149: build: glib-or-gtk: Generate the gdk-pixbuf-loaders cache file in a phase., guix-commits, 2021/10/26
- 132/149: gnu: webkitgtk: Add a debug output., guix-commits, 2021/10/26
- 139/149: gnu: gdk-pixbuf: Add a search path for the loaders cache file., guix-commits, 2021/10/26