[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
141/169: gnu: librsvg: Preserve the loaders.cache file.
From: |
guix-commits |
Subject: |
141/169: gnu: librsvg: Preserve the loaders.cache file. |
Date: |
Thu, 28 Oct 2021 02:08:59 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit 800737e533db13cac29ba5bc42be89ff8d59fc11
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Fri Oct 22 00:44:51 2021 -0400
gnu: librsvg: Preserve the loaders.cache file.
Now that we have a search path that honors it on gdk-pixbuf, it is more
valuable to keep it.
* gnu/packages/gnome.scm (librsvg)[phases]{pre-configure}: Install loaders,
cache file to locations derived from %gdk-pixbuf-loaders-cache-file.
---
gnu/packages/gnome.scm | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 08d4669..c3bdf2d 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -3487,17 +3487,20 @@ for dealing with different structured file formats.")
(substitute* '("Makefile.am" "Makefile.in")
(("--locked") ""))))
(add-before 'configure 'pre-configure
- (lambda _
+ (lambda* (#:key outputs #:allow-other-keys)
(substitute* "gdk-pixbuf-loader/Makefile.in"
;; By default the gdk-pixbuf loader is installed under
;; gdk-pixbuf's prefix. Work around that.
(("gdk_pixbuf_moduledir = .*$")
(string-append "gdk_pixbuf_moduledir = "
- "$(prefix)/lib/gdk-pixbuf-2.0/2.10.0/"
- "loaders\n"))
- ;; Drop the 'loaders.cache' file, it's in gdk-pixbuf+svg.
- (("gdk_pixbuf_cache_file = .*$")
- "gdk_pixbuf_cache_file = $(TMPDIR)/loaders.cache\n"))))
+ "$(prefix)/"
+ ,(dirname %gdk-pixbuf-loaders-cache-file) "/"
+ "loaders\n")))
+ (substitute* "configure"
+ (("gdk_pixbuf_cache_file=.*")
+ (string-append "gdk_pixbuf_cache_file="
+ (assoc-ref outputs "out") "/"
+ ,%gdk-pixbuf-loaders-cache-file "\n")))))
(add-after 'configure 'gnu-configure
(lambda* (#:key outputs #:allow-other-keys #:rest args)
(apply (assoc-ref gnu:%standard-phases 'configure)
- 93/169: gnu: Build all Rust packages using the latest rustc., (continued)
- 93/169: gnu: Build all Rust packages using the latest rustc., guix-commits, 2021/10/28
- 101/169: gnu: python-pathlib2: Update to 2.3.6., guix-commits, 2021/10/28
- 109/169: gnu: json-glib-minimal: Introduce minimal variant., guix-commits, 2021/10/28
- 118/169: gnu: cmake-bootstrap: Update to 3.21.3., guix-commits, 2021/10/28
- 120/169: gnu: mit-krb5: Absorb 1.19.2 graft., guix-commits, 2021/10/28
- 133/169: gnu: python-flit: Update to 3.3.0., guix-commits, 2021/10/28
- 116/169: gnu: mesa: Update to 21.2.4., guix-commits, 2021/10/28
- 119/169: gnu: openssl: Absorb 1.1.1l graft., guix-commits, 2021/10/28
- 128/169: gnu: libsoup: Reverse inheritance relationship with libsoup-minimal., guix-commits, 2021/10/28
- 140/169: gnu: gtk: Replace gdk-pixbuf+svg by librsvg., guix-commits, 2021/10/28
- 141/169: gnu: librsvg: Preserve the loaders.cache file.,
guix-commits <=
- 66/169: gnu: gst-editing-services: Update to 1.18.5., guix-commits, 2021/10/28
- 71/169: gnu: dbus-c++: Fix build., guix-commits, 2021/10/28
- 38/169: gnu: python-sphinx: Update to 4.2.0., guix-commits, 2021/10/28
- 36/169: gnu: python-sphinxcontrib-htmlhelp: Update to 2.0.0., guix-commits, 2021/10/28
- 39/169: gnu: gstreamer-docs: Update to 1.19.2., guix-commits, 2021/10/28
- 55/169: gnu: abseil-cpp: Update to 20210324.2., guix-commits, 2021/10/28
- 54/169: gnu: abseil-cpp: Remove googletest patch., guix-commits, 2021/10/28
- 58/169: gnu: polkit: Update to 0.120 and ungraft., guix-commits, 2021/10/28
- 60/169: gnu: gstreamer: Update to 1.18.5., guix-commits, 2021/10/28
- 61/169: gnu: gst-plugins-base: Update to 1.18.5., guix-commits, 2021/10/28