guix_mirror_bot pushed a commit to branch gnome-team
in repository guix.
commit c9404d14b37539820af43cda55b84ccd945039ee
Author: Dariqq <[email protected]>
AuthorDate: Sun Jun 14 06:44:27 2026 +0000
gnu: gtk: Change librsvg to native input.
With gtk 4.22 librsvg is (optionally) only used for tests.
gtk previously relied on gdk-pixbuf being propagated from librsvg so add it
back.
* gnu/packages/gtk.scm (gtk)
[native-inputs]: Add librsvg if supported.
[propagated-inputs]: Remove librsvg. Add gdk-pixbuf.
Change-Id: I0a5bfc3f289d523810e0375f015a85f5f9838103
Signed-off-by: NoƩ Lopez <[email protected]>
---
gnu/packages/gtk.scm | 57 ++++++++++++++++++++++++++++------------------------
1 file changed, 31 insertions(+), 26 deletions(-)
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index d442025e80..5a961933c5 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -1294,31 +1294,36 @@ application suites.")
(add-after 'install 'check
(assoc-ref %standard-phases 'check)))))
(native-inputs
- (list docbook-xml-4.3
- docbook-xsl
- gettext-minimal
- `(,glib "bin")
- glibc-utf8-locales ;some tests require en_US.UTF-8
- gobject-introspection ;for building introspection data
- graphene
- gtk-doc/stable ;for building documentation
- intltool
- libxslt ;for building man-pages
- pkg-config
- python-pygobject
- ;; These python modules are required for building documentation.
- python-docutils-0.19
- python-jinja2
- python-markdown
- python-markupsafe
- python-pygments
- python-toml
- python-typogrify
- sassc ;for building themes
- shaderc
- tzdata-for-tests
- vala
- xorg-server-for-tests))
+ (append (if (supported-package? librsvg)
+ ;; Only needed for tests
+ (list librsvg)
+ '())
+ (list
+ docbook-xml-4.3
+ docbook-xsl
+ gettext-minimal
+ `(,glib "bin")
+ glibc-utf8-locales ;some tests require en_US.UTF-8
+ gobject-introspection ;for building introspection data
+ graphene
+ gtk-doc/stable ;for building documentation
+ intltool
+ libxslt ;for building man-pages
+ pkg-config
+ python-pygobject
+ ;; These python modules are required for building documentation.
+ python-docutils-0.19
+ python-jinja2
+ python-markdown
+ python-markupsafe
+ python-pygments
+ python-toml
+ python-typogrify
+ sassc ;for building themes
+ shaderc
+ tzdata-for-tests
+ vala
+ xorg-server-for-tests)))
(inputs
(list colord ;for color printing support
cups ;for CUPS print-backend
@@ -1342,7 +1347,7 @@ application suites.")
;; Following dependencies are referenced in .pc files.
(list cairo
fontconfig
- (librsvg-for-system)
+ gdk-pixbuf
glib
graphene
libepoxy