aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Bakke <marius@gnu.org>2022-07-25 03:03:10 +0200
committerMarius Bakke <marius@gnu.org>2022-07-27 17:53:48 +0200
commit8c698d7de640d2914a19f9709aeea716effb88d3 (patch)
tree7db467abbe5a8d26eb1c139bd0993bfb877ec4ca
parent1c526affa3edd89ebad94d23c9eb323f18af4fad (diff)
downloadguix-8c698d7de640d2914a19f9709aeea716effb88d3.tar
guix-8c698d7de640d2914a19f9709aeea716effb88d3.tar.gz
gnu: gdk-pixbuf: Propagate private dependencies.
* gnu/packages/gtk.scm (gdk-pixbuf)[inputs]: Move LIBJPEG-TURBO, LIBPNG, and LIBTIFF ... [propagated-inputs]: ... here. Remove LIBX11 while at it.
-rw-r--r--gnu/packages/gtk.scm23
1 files changed, 10 insertions, 13 deletions
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index f12c697452..d24738564c 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -671,20 +671,17 @@ highlighting and other features typical of a source code editor.")
(invoke "meson" "test" "--timeout-multiplier" "5")))))
'()))))
(propagated-inputs
- (list ;; Required by gdk-pixbuf-2.0.pc
- glib
- ;; Required by gdk-pixbuf-xlib-2.0.pc
- ;; TODO: Remove on core-updates.
- libx11
- ;; Used for testing and required at runtime.
- shared-mime-info))
+ (list glib ;in Requires of gdk-pixbuf-2.0.pc
+
+ ;; These are in Requires.private of gdk-pixbuf-2.0.pc
+ libjpeg-turbo
+ libpng
+ libtiff
+ shared-mime-info)) ;required at runtime, too
(inputs
- `(,@(if (%current-target-system)
- `(("bash-minimal" ,bash-minimal)) ; for glib-or-gtk-wrap
- '())
- ("libjpeg" ,libjpeg-turbo)
- ("libpng" ,libpng)
- ("libtiff" ,libtiff)))
+ (if (%current-target-system)
+ (list bash-minimal) ;for glib-or-gtk-wrap
+ '()))
(native-inputs
`(("docbook-xml" ,docbook-xml-4.3)
("docbook-xsl" ,docbook-xsl)