[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
141/149: gnu: librsvg: Preserve the loaders.cache file.
From: |
guix-commits |
Subject: |
141/149: gnu: librsvg: Preserve the loaders.cache file. |
Date: |
Tue, 26 Oct 2021 23:52:44 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit 21901500ca7f49bc3c852b071c39b439f5443a9e
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 a89cd8e..7556b0c 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)
- 88/149: guix: packages: Fix repacking of plain tarballs., (continued)
- 88/149: guix: packages: Fix repacking of plain tarballs., guix-commits, 2021/10/26
- 100/149: gnu: python-pytest-6: Fix version via setuptools-scm., guix-commits, 2021/10/26
- 103/149: build: glib-or-gtk-build-system: Simplify the wrap-all-programs phase., guix-commits, 2021/10/26
- 112/149: gnu: libcloudproviders-minimal: Introduce minimal variant., guix-commits, 2021/10/26
- 123/149: gnu: pango: Update to 1.48.10., guix-commits, 2021/10/26
- 128/149: gnu: libsoup: Reverse inheritance relationship with libsoup-minimal., guix-commits, 2021/10/26
- 136/149: gnu: gtk: Add the generate-gdk-pixbuf-loaders-cache-file phase., guix-commits, 2021/10/26
- 137/149: build: glib-or-gtk: Generate the gdk-pixbuf-loaders cache file in a phase., guix-commits, 2021/10/26
- 132/149: gnu: webkitgtk: Add a debug output., guix-commits, 2021/10/26
- 139/149: gnu: gdk-pixbuf: Add a search path for the loaders cache file., guix-commits, 2021/10/26
- 141/149: gnu: librsvg: Preserve the loaders.cache file.,
guix-commits <=
- 142/149: gnu: gawk: Use regular bash to cope with test suite failures., guix-commits, 2021/10/26
- 144/149: gnu: cdparanoia: Disable parallel build., guix-commits, 2021/10/26
- 148/149: gnu: jsoncpp: Apply patch to regular package., guix-commits, 2021/10/26
- 149/149: nix: libstore: Do not remove unused links when deleting specific items., guix-commits, 2021/10/26
- 69/149: gnu: tensorflow: Enable parallel build (at least partially)., guix-commits, 2021/10/26
- 74/149: gnu: python-keras: Skip a flaky test., guix-commits, 2021/10/26
- 79/149: gnu: diffutils: Fix signal processing., guix-commits, 2021/10/26
- 82/149: gnu: curl: Honor #:tests?., guix-commits, 2021/10/26
- 83/149: gnu: gcc-5: Fix powerpc64le-linux build, guix-commits, 2021/10/26
- 87/149: gnu: gdb: Normalize indentation., guix-commits, 2021/10/26