[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
141/180: gnu: librsvg: Preserve the loaders.cache file.
From: |
guix-commits |
Subject: |
141/180: gnu: librsvg: Preserve the loaders.cache file. |
Date: |
Fri, 29 Oct 2021 15:57:08 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit ea5cabe1e6b46fbfa5cb5d8f80d7ed0b5e0e3a2e
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 bed6e51..fea958e 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)
- 111/180: gnu: colord-minimal: Introduce minimal variant., (continued)
- 111/180: gnu: colord-minimal: Introduce minimal variant., guix-commits, 2021/10/29
- 118/180: gnu: cmake-bootstrap: Update to 3.21.3., guix-commits, 2021/10/29
- 119/180: gnu: openssl: Absorb 1.1.1l graft., guix-commits, 2021/10/29
- 124/180: gnu: libthai: Make datrie a normal native-input., guix-commits, 2021/10/29
- 131/180: gnu: pulseaudio: Add doxygen to fix build., guix-commits, 2021/10/29
- 133/180: gnu: python-flit: Update to 3.3.0., guix-commits, 2021/10/29
- 132/180: gnu: webkitgtk: Add a debug output., guix-commits, 2021/10/29
- 130/180: gnu: webkitgtk: Update to 2.34.1., guix-commits, 2021/10/29
- 134/180: gnu: llvm: Add make-lld-wrapper, lld-wrapper and lld-as-ld-wrapper., guix-commits, 2021/10/29
- 138/180: profiles: Add a gdk-pixbuf-loaders-cache-file hook., guix-commits, 2021/10/29
- 141/180: gnu: librsvg: Preserve the loaders.cache file.,
guix-commits <=
- 143/180: gnu: elogind: Update to 246.10., guix-commits, 2021/10/29
- 92/180: gnu: rust: Add rust 1.54 and move all non-bootstrapping logic to it., guix-commits, 2021/10/29
- 105/180: gnu: at-spi2-core: Reverse inheritance relationship with minimal variant., guix-commits, 2021/10/29
- 104/180: build: glib-or-gtk-build-system: Fix indentation., guix-commits, 2021/10/29
- 128/180: gnu: libsoup: Reverse inheritance relationship with libsoup-minimal., guix-commits, 2021/10/29
- 156/180: gnu: python-six-bootstrap: Update to 1.16.0., guix-commits, 2021/10/29
- 158/180: gnu: gdk-pixbuf: Remove obsolete jasper support., guix-commits, 2021/10/29
- 163/180: gnu: python-numpy: Update to 1.21.3 and cleanup., guix-commits, 2021/10/29
- 174/180: gnu: xkeyboard-config: Update to 2.34., guix-commits, 2021/10/29
- 180/180: gnu: network-manager: Update to 1.32.12., guix-commits, 2021/10/29