[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
141/217: gnu: librsvg: Preserve the loaders.cache file.
From: |
guix-commits |
Subject: |
141/217: gnu: librsvg: Preserve the loaders.cache file. |
Date: |
Sun, 14 Nov 2021 19:21:06 -0500 (EST) |
vagrantc pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit 407dc7a8371c72d06d1b1260fbdefb3364bd1158
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 135d928..81d29e0 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)
- 117/217: gnu: graphviz: Update to 2.49.0., (continued)
- 117/217: gnu: graphviz: Update to 2.49.0., guix-commits, 2021/11/14
- 121/217: gnu: util-linux: Globally disable the lsns test., guix-commits, 2021/11/14
- 124/217: gnu: libthai: Make datrie a normal native-input., guix-commits, 2021/11/14
- 125/217: gnu: glib: Update to 2.70, specify a bindir prefix and hide package., guix-commits, 2021/11/14
- 126/217: gnu: glib-networking: Update to 2.70.rc., guix-commits, 2021/11/14
- 127/217: gnu: vala: Update to 0.54.2., guix-commits, 2021/11/14
- 133/217: gnu: python-flit: Update to 3.3.0., guix-commits, 2021/11/14
- 136/217: gnu: gtk: Add the generate-gdk-pixbuf-loaders-cache-file phase., guix-commits, 2021/11/14
- 135/217: gnu: ungoogled-chromium: Use the new lld-as-ld-wrapper., guix-commits, 2021/11/14
- 137/217: build: glib-or-gtk: Generate the gdk-pixbuf-loaders cache file in a phase., guix-commits, 2021/11/14
- 141/217: gnu: librsvg: Preserve the loaders.cache file.,
guix-commits <=
- 142/217: gnu: gawk: Use regular bash to cope with test suite failures., guix-commits, 2021/11/14
- 150/217: gnu: curl: Update to 7.79.1., guix-commits, 2021/11/14
- 146/217: gnu: nspr: Normalize inputs., guix-commits, 2021/11/14
- 144/217: gnu: cdparanoia: Disable parallel build., guix-commits, 2021/11/14
- 149/217: gnu: meson: Update to 0.60.0., guix-commits, 2021/11/14
- 148/217: gnu: jsoncpp: Apply patch to regular package., guix-commits, 2021/11/14
- 157/217: gnu: python-dateutil: Update to 2.8.2., guix-commits, 2021/11/14
- 154/217: gnu: python-dbusmock: Update to 0.24.0., guix-commits, 2021/11/14
- 163/217: gnu: python-numpy: Update to 1.21.3 and cleanup., guix-commits, 2021/11/14
- 159/217: gnu: gstreamer: Disable the pipelines-seek test., guix-commits, 2021/11/14