[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
141/201: gnu: librsvg: Preserve the loaders.cache file.
From: |
guix-commits |
Subject: |
141/201: gnu: librsvg: Preserve the loaders.cache file. |
Date: |
Mon, 1 Nov 2021 23:19:01 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit f7907b170210a249d1fa285b0d07472dcdddd5b4
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)
- 114/201: gnu: rest: Use libsoup-minimal., (continued)
- 114/201: gnu: rest: Use libsoup-minimal., guix-commits, 2021/11/01
- 117/201: gnu: graphviz: Update to 2.49.0., guix-commits, 2021/11/01
- 126/201: gnu: glib-networking: Update to 2.70.rc., guix-commits, 2021/11/01
- 128/201: gnu: libsoup: Reverse inheritance relationship with libsoup-minimal., guix-commits, 2021/11/01
- 132/201: gnu: webkitgtk: Add a debug output., guix-commits, 2021/11/01
- 118/201: gnu: cmake-bootstrap: Update to 3.21.3., guix-commits, 2021/11/01
- 136/201: gnu: gtk: Add the generate-gdk-pixbuf-loaders-cache-file phase., guix-commits, 2021/11/01
- 139/201: gnu: gdk-pixbuf: Add a search path for the loaders cache file., guix-commits, 2021/11/01
- 131/201: gnu: pulseaudio: Add doxygen to fix build., guix-commits, 2021/11/01
- 140/201: gnu: gtk: Replace gdk-pixbuf+svg by librsvg., guix-commits, 2021/11/01
- 141/201: gnu: librsvg: Preserve the loaders.cache file.,
guix-commits <=
- 162/201: gnu: zxing-cpp: Update to 1.2.0-0.00783db., guix-commits, 2021/11/01
- 166/201: gnu: python2-lit: Remove package., guix-commits, 2021/11/01
- 168/201: gnu: Add cling., guix-commits, 2021/11/01
- 163/201: gnu: python-numpy: Update to 1.21.3 and cleanup., guix-commits, 2021/11/01
- 165/201: gnu: ldc: Update to 1.27.1., guix-commits, 2021/11/01
- 193/201: gnu: python-distro: Update to 1.6.0., guix-commits, 2021/11/01
- 189/201: gnu: Remove references to a removed patch., guix-commits, 2021/11/01
- 171/201: gnu: gtkmm: Update to 4.4.0., guix-commits, 2021/11/01
- 184/201: gnu: emacs-elpy: Update to 1.35.0-0.8d0de31., guix-commits, 2021/11/01
- 191/201: gnu: python-docker: Update to 5.0.3 and remove obsolete package variants., guix-commits, 2021/11/01