[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
138/201: profiles: Add a gdk-pixbuf-loaders-cache-file hook.
From: |
guix-commits |
Subject: |
138/201: profiles: Add a gdk-pixbuf-loaders-cache-file hook. |
Date: |
Mon, 1 Nov 2021 23:19:00 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit 42bc208a0e645d7b606d49cb4703d5f43864250d
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/status.scm (hook-message): Register it here too.
---
guix/profiles.scm | 29 ++++++++++++++++++++++++++++-
guix/status.scm | 2 ++
2 files changed, 30 insertions(+), 1 deletion(-)
diff --git a/guix/profiles.scm b/guix/profiles.scm
index aad23c0..b628378 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>
@@ -1180,6 +1180,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."
@@ -1691,6 +1717,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
diff --git a/guix/status.scm b/guix/status.scm
index f351a56..eefe183 100644
--- a/guix/status.scm
+++ b/guix/status.scm
@@ -381,6 +381,8 @@ the current build phase."
(G_ "building CA certificate bundle..."))
('emacs-subdirs
(G_ "listing Emacs sub-directories..."))
+ ('gdk-pixbuf-loaders-cache-file
+ (G_ "generating GdkPixbuf loaders cache..."))
('glib-schemas
(G_ "generating GLib schema cache..."))
('gtk-icon-themes
- 194/201: gnu: docker-compose: Update to 1.29.2., (continued)
- 194/201: gnu: docker-compose: Update to 1.29.2., guix-commits, 2021/11/01
- 73/201: bluez: Update to 5.61., guix-commits, 2021/11/01
- 80/201: gnu: diffutils: Update to 3.8., guix-commits, 2021/11/01
- 84/201: gnu: make-ld-wrapper: Add a LINKER argument., guix-commits, 2021/11/01
- 88/201: guix: packages: Fix repacking of plain tarballs., guix-commits, 2021/11/01
- 93/201: gnu: Build all Rust packages using the latest rustc., guix-commits, 2021/11/01
- 108/201: gnu: lsof: Fix indentation., guix-commits, 2021/11/01
- 120/201: gnu: mit-krb5: Absorb 1.19.2 graft., guix-commits, 2021/11/01
- 123/201: gnu: pango: Update to 1.48.10., guix-commits, 2021/11/01
- 129/201: gnu: libsoup: Update to 3.0.1., guix-commits, 2021/11/01
- 138/201: profiles: Add a gdk-pixbuf-loaders-cache-file hook.,
guix-commits <=
- 156/201: gnu: python-six-bootstrap: Update to 1.16.0., guix-commits, 2021/11/01
- 160/201: gnu: mesa: Replace obsolete vulkan-overlay-layer build option., guix-commits, 2021/11/01
- 192/201: gnu: Add python-dotenv., guix-commits, 2021/11/01
- 198/201: gnu: ansible: Update to 4.7.0., guix-commits, 2021/11/01
- 179/201: gnu: Add polkit-duktape., guix-commits, 2021/11/01
- 61/201: gnu: gst-plugins-base: Update to 1.18.5., guix-commits, 2021/11/01
- 72/201: gnu: libnice: Update to 0.1.18-0.47a9633 and disable test-bind test., guix-commits, 2021/11/01
- 121/201: gnu: util-linux: Globally disable the lsns test., guix-commits, 2021/11/01
- 134/201: gnu: llvm: Add make-lld-wrapper, lld-wrapper and lld-as-ld-wrapper., guix-commits, 2021/11/01
- 145/201: gnu: mariadb: Only run the main test suite to avoid flaky tests., guix-commits, 2021/11/01