[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
137/149: build: glib-or-gtk: Generate the gdk-pixbuf-loaders cache file
From: |
guix-commits |
Subject: |
137/149: build: glib-or-gtk: Generate the gdk-pixbuf-loaders cache file in a phase. |
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 5dfe15f551d2a4ecf460bcf1675ff737ff4ffb23
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sun Oct 3 00:25:36 2021 -0400
build: glib-or-gtk: Generate the gdk-pixbuf-loaders cache file in a phase.
Adding a profile hook to do so covers most use cases, but it is still
necessary to have the gdk-pixbuf loaders cache file computed at build time,
as
software may expect to find loaders support at that time.
* guix/build/glib-or-gtk-build-system.scm: Delete trailing #t.
(%gdk-pixbuf-loaders-cache-file-prefix): New variable.
(generate-gdk-pixbuf-loaders-cache): New procedure.
(generate-gdk-pixbuf-loaders-cache-file): Add procedure...
(%standard-phases): ... and register it as a build phase.
---
guix/build-system/glib-or-gtk.scm | 5 ++-
guix/build/glib-or-gtk-build-system.scm | 55 ++++++++++++++++++++++++++++++---
2 files changed, 55 insertions(+), 5 deletions(-)
diff --git a/guix/build-system/glib-or-gtk.scm
b/guix/build-system/glib-or-gtk.scm
index 0c88f03..aa97038 100644
--- a/guix/build-system/glib-or-gtk.scm
+++ b/guix/build-system/glib-or-gtk.scm
@@ -26,6 +26,8 @@
#:use-module (guix monads)
#:use-module (guix derivations)
#:use-module (guix search-paths)
+ #:use-module ((guix build glib-or-gtk-build-system)
+ #:select (%gdk-pixbuf-loaders-cache-file))
#:use-module (guix build-system)
#:use-module (guix build-system gnu)
#:use-module (guix packages)
@@ -33,7 +35,8 @@
#:export (%glib-or-gtk-build-system-modules
glib-or-gtk-build
glib-or-gtk-cross-build
- glib-or-gtk-build-system))
+ glib-or-gtk-build-system)
+ #:re-export (%gdk-pixbuf-loaders-cache-file)) ;for convenience
;; Commentary:
;;
diff --git a/guix/build/glib-or-gtk-build-system.scm
b/guix/build/glib-or-gtk-build-system.scm
index c2f814e..785eb54 100644
--- a/guix/build/glib-or-gtk-build-system.scm
+++ b/guix/build/glib-or-gtk-build-system.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
+;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -28,6 +29,8 @@
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-26)
#:export (%standard-phases
+ %gdk-pixbuf-loaders-cache-file
+ generate-gdk-pixbuf-loaders-cache
glib-or-gtk-build))
;; Commentary:
@@ -183,8 +186,7 @@ add a dependency of that output on GLib and GTK+."
(apply wrap-program program #:sh (sh) env-vars))
bin-list))))))
- (for-each handle-output outputs)
- #t)
+ (for-each handle-output outputs))
(define* (compile-glib-schemas #:key outputs #:allow-other-keys)
"Implement phase \"glib-or-gtk-compile-schemas\": compile \"glib\" schemas
@@ -197,11 +199,56 @@ if needed."
(not (file-exists?
(string-append schemasdir
"/gschemas.compiled"))))
(invoke "glib-compile-schemas" schemasdir)))))
- outputs)
- #t)
+ outputs))
+
+(define %gdk-pixbuf-loaders-cache-file
+ "lib/gdk-pixbuf-2.0/2.10.0/loaders.cache")
+
+(define (generate-gdk-pixbuf-loaders-cache directories outputs)
+ "Generate the loaders.cache file used by gdk-pixbuf to locate the available
+loaders among DIRECTORIES, and set the GDK_PIXBUF_MODULE_FILE environment
+variable. The cache file is installed under OUTPUTS. Return the first cache
+file name if one was created else #f."
+ (let* ((loaders (append-map
+ (cut find-files <> "^libpixbufloader-.*\\.so$")
+ directories))
+ (outputs* (map (cut string-append <> "/"
+ %gdk-pixbuf-loaders-cache-file)
+ outputs))
+ (loaders.cache (first outputs*))
+ (loaders.cache-copies (cdr outputs*)))
+ (if (not (null? loaders))
+ (begin
+ (mkdir-p (dirname loaders.cache))
+ (setenv "GDK_PIXBUF_MODULE_FILE" loaders.cache)
+ (apply invoke "gdk-pixbuf-query-loaders" "--update-cache" loaders)
+ (for-each (lambda (f)
+ (mkdir-p (dirname f))
+ (copy-file loaders.cache f))
+ loaders.cache-copies)
+ loaders.cache)
+ #f)))
+
+(define* (generate-gdk-pixbuf-loaders-cache-file #:key inputs outputs
+ #:allow-other-keys)
+ "Build phase that Wraps the GENERATE-GDK-PIXBUF-LOADERS-CACHE procedure."
+ ;; Conditionally compute the cache file if the gdk-pixbuf command is
+ ;; available on PATH (it comes with gdk-pixbuf).
+ (when (which "gdk-pixbuf-query-loaders")
+ (let ((loaders.cache (generate-gdk-pixbuf-loaders-cache
+ (map cdr inputs)
+ (filter-map identity
+ (list
+ (assoc-ref outputs "out")
+ (assoc-ref outputs "bin")
+ (assoc-ref outputs "lib"))))))
+ (when loaders.cache
+ (format #t "GDK_PIXBUF_MODULE_FILE set to `~a'~%" loaders.cache)))))
(define %standard-phases
(modify-phases gnu:%standard-phases
+ (add-after 'unpack 'generate-gdk-pixbuf-loaders-cache-file
+ generate-gdk-pixbuf-loaders-cache-file)
(add-after 'install 'glib-or-gtk-compile-schemas compile-glib-schemas)
(add-after 'install 'glib-or-gtk-wrap wrap-all-programs)))
- 129/149: gnu: libsoup: Update to 3.0.1., (continued)
- 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, 2021/10/26
- 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 <=
- 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
- 141/149: gnu: librsvg: Preserve the loaders.cache file., guix-commits, 2021/10/26
- 142/149: gnu: gawk: Use regular bash to cope with test suite failures., guix-commits, 2021/10/26
- 144/149: gnu: cdparanoia: Disable parallel build., guix-commits, 2021/10/26
- 148/149: gnu: jsoncpp: Apply patch to regular package., guix-commits, 2021/10/26
- 149/149: nix: libstore: Do not remove unused links when deleting specific items., guix-commits, 2021/10/26
- 69/149: gnu: tensorflow: Enable parallel build (at least partially)., guix-commits, 2021/10/26
- 74/149: gnu: python-keras: Skip a flaky test., guix-commits, 2021/10/26
- 79/149: gnu: diffutils: Fix signal processing., guix-commits, 2021/10/26