[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
141/227: gnu: librsvg: Preserve the loaders.cache file.
From: |
guix-commits |
Subject: |
141/227: gnu: librsvg: Preserve the loaders.cache file. |
Date: |
Thu, 11 Nov 2021 12:30:27 -0500 (EST) |
apteryx pushed a commit to branch core-updates-frozen
in repository guix.
commit 000291fd4325d2afd1f9f93125986275f6e7ab7a
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 1e1f989..1e59dfa 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -3488,17 +3488,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)
- 134/227: gnu: llvm: Add make-lld-wrapper, lld-wrapper and lld-as-ld-wrapper., (continued)
- 134/227: gnu: llvm: Add make-lld-wrapper, lld-wrapper and lld-as-ld-wrapper., guix-commits, 2021/11/11
- 117/227: gnu: graphviz: Update to 2.49.0., guix-commits, 2021/11/11
- 119/227: gnu: openssl: Absorb 1.1.1l graft., guix-commits, 2021/11/11
- 125/227: gnu: glib: Update to 2.70, specify a bindir prefix and hide package., guix-commits, 2021/11/11
- 132/227: gnu: webkitgtk: Add a debug output., guix-commits, 2021/11/11
- 157/227: gnu: python-dateutil: Update to 2.8.2., guix-commits, 2021/11/11
- 116/227: gnu: mesa: Update to 21.2.4., guix-commits, 2021/11/11
- 129/227: gnu: libsoup: Update to 3.0.1., guix-commits, 2021/11/11
- 120/227: gnu: mit-krb5: Absorb 1.19.2 graft., guix-commits, 2021/11/11
- 138/227: profiles: Add a gdk-pixbuf-loaders-cache-file hook., guix-commits, 2021/11/11
- 141/227: gnu: librsvg: Preserve the loaders.cache file.,
guix-commits <=
- 147/227: gnu: nss: Update to 3.71., guix-commits, 2021/11/11
- 153/227: gnu: boost: Update to 1.77.0., guix-commits, 2021/11/11
- 154/227: gnu: python-dbusmock: Update to 0.24.0., guix-commits, 2021/11/11
- 158/227: gnu: gdk-pixbuf: Remove obsolete jasper support., guix-commits, 2021/11/11
- 162/227: gnu: zxing-cpp: Update to 1.2.0-0.00783db., guix-commits, 2021/11/11
- 163/227: gnu: python-numpy: Update to 1.21.3 and cleanup., guix-commits, 2021/11/11
- 128/227: gnu: libsoup: Reverse inheritance relationship with libsoup-minimal., guix-commits, 2021/11/11
- 130/227: gnu: webkitgtk: Use libsoup 3 and build with GCC., guix-commits, 2021/11/11
- 118/227: gnu: cmake-bootstrap: Update to 3.21.3., guix-commits, 2021/11/11
- 122/227: gnu: heimdal: Fix build., guix-commits, 2021/11/11