[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
79/115: gnu: gtk+: Add missing inputs.
From: |
guix-commits |
Subject: |
79/115: gnu: gtk+: Add missing inputs. |
Date: |
Wed, 12 May 2021 21:01:41 -0400 (EDT) |
raghavgururajan pushed a commit to branch wip-gnome
in repository guix.
commit c7bbdc641c01a0488c67fdfc5924e9ba0e9e2f84
Author: Raghav Gururajan <rg@raghavgururajan.name>
AuthorDate: Fri Mar 12 08:32:10 2021 -0500
gnu: gtk+: Add missing inputs.
* gnu/packages/gtk.scm (gtk+) [native-inputs]: Add docbook-xml,
hicolor-icon-theme, intltool, sassc and libxslt.
[inputs]: Add graphene, harfbuzz, iso-codes and papi.
[propagated-inputs]: Add cairo, fribidi, fontconfig, freetype, glib,
libx11, libxcomposite, libxext, libxfixes and libxrender.
Signed-off-by: Léo Le Bouter <lle-bout@zaclys.net>
---
gnu/packages/gtk.scm | 48 +++++++++++++++++++++++++++++++++++-------------
1 file changed, 35 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index b407dec..400801d 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -79,6 +79,7 @@
#:use-module (gnu packages graphviz)
#:use-module (gnu packages icu4c)
#:use-module (gnu packages image)
+ #:use-module (gnu packages iso-codes)
#:use-module (gnu packages libffi)
#:use-module (gnu packages linux)
#:use-module (gnu packages m4)
@@ -87,12 +88,14 @@
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages pretty-print)
+ #:use-module (gnu packages profiling)
#:use-module (gnu packages python)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages guile)
#:use-module (gnu packages guile-xyz)
#:use-module (gnu packages cups)
#:use-module (gnu packages version-control)
+ #:use-module (gnu packages web)
#:use-module (gnu packages xml)
#:use-module (gnu packages xorg)
#:use-module (gnu packages xdisorg)
@@ -942,44 +945,63 @@ application suites.")
(patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch"
"gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch"))))
(propagated-inputs
- `(("at-spi2-atk" ,at-spi2-atk)
- ("atk" ,atk)
+ `(("atk" ,atk)
+ ("at-spi2-atk" ,at-spi2-atk)
+ ("cairo" ,cairo)
+ ("fribidi" ,fribidi)
+ ("fontconfig" ,fontconfig)
+ ("freetype" ,freetype)
;; SVG support is optional and requires librsvg, which pulls in rust.
;; Rust is not supported well on every architecture yet.
("gdk-pixbuf" ,(if (string-prefix? "x86_64" (or (%current-target-system)
(%current-system)))
gdk-pixbuf+svg
gdk-pixbuf))
+ ("glib" ,glib)
("libepoxy" ,libepoxy)
+ ("libx11" ,libx11)
+ ("libxcomposite" ,libxcomposite)
("libxcursor" ,libxcursor)
+ ("libxdamage" ,libxdamage)
+ ("libxext" ,libxext)
+ ("libxfixes" ,libxfixes)
("libxi" ,libxi)
("libxinerama" ,libxinerama)
("libxkbcommon" ,libxkbcommon)
- ("libxdamage" ,libxdamage)
("libxrandr" ,libxrandr)
+ ("libxrender" ,libxrender)
("mesa" ,mesa)
("pango" ,pango)
("wayland" ,wayland)
("wayland-protocols" ,wayland-protocols)))
(inputs
- `(("libxml2" ,libxml2)
- ;; XXX: colord depends on mozjs (through polkit), which fails on
+ `(;; XXX: colord depends on mozjs (through polkit), which fails on
;; on non-intel systems now.
- ;;("colord" ,colord)
- ("cups" ,cups) ;for printing support
+ ("colord" ,colord)
+ ("cups" ,cups)
+ ("graphene" ,graphene)
+ ("harfbuzz" ,harfbuzz)
+ ("iso-codes" ,iso-codes)
+ ("json-glib" ,json-glib)
+ ("libxml2" ,libxml2)
+ ("papi" ,papi)
;; XXX: rest depends on p11-kit, which fails on mips64el now.
- ;;("rest" ,rest)
- ("json-glib" ,json-glib)))
+ ("rest" ,rest)))
(native-inputs
- `(("perl" ,perl)
- ("glib" ,glib "bin")
+ `(("docbook-xml" ,docbook-xml-4.1.2)
("gettext" ,gettext-minimal)
- ("pkg-config" ,pkg-config)
+ ("glib" ,glib "bin")
("gobject-introspection" ,gobject-introspection)
+ ("hicolor-icon-theme" ,hicolor-icon-theme)
+ ("intltool" ,intltool)
+ ("perl" ,perl)
+ ("pkg-config" ,pkg-config)
("python-wrapper" ,python-wrapper)
+ ("sassc" ,sassc)
;; By using a special xorg-server for GTK+'s tests, we reduce the impact
;; of updating xorg-server directly on the master branch.
- ("xorg-server" ,xorg-server-for-tests)))
+ ("xorg-server" ,xorg-server-for-tests)
+ ("xsltproc" ,libxslt)))
(arguments
`(#:disallowed-references (,xorg-server-for-tests)
;; 47 MiB goes to "out" (24 of which is locale data!), and 26 MiB goes
- 54/115: gnu: libgsf: Update synopsis, description, home-page and license., (continued)
- 54/115: gnu: libgsf: Update synopsis, description, home-page and license., guix-commits, 2021/05/12
- 57/115: gnu: atk: Update home-page and license., guix-commits, 2021/05/12
- 70/115: gnu: wayland: Update to 1.19.0., guix-commits, 2021/05/12
- 64/115: gnu: at-spi2-core: Update home-page and license., guix-commits, 2021/05/12
- 61/115: gnu: Add atkmm-2.28., guix-commits, 2021/05/12
- 71/115: gnu: wayland: Fix and move documentation., guix-commits, 2021/05/12
- 59/115: gnu: atkmm: Enable documentation., guix-commits, 2021/05/12
- 65/115: gnu: at-spi2-atk: Update to 2.38.0., guix-commits, 2021/05/12
- 60/115: gnu: atkmm: Update synopsis, description, home-page and license., guix-commits, 2021/05/12
- 74/115: gnu: yelp-xsl: Enable documentation., guix-commits, 2021/05/12
- 79/115: gnu: gtk+: Add missing inputs.,
guix-commits <=
- 97/115: gnu: gst-libav: Update to 1.18.4., guix-commits, 2021/05/12
- 77/115: gnu: gtk+-2: Update to 2.24.33., guix-commits, 2021/05/12
- 83/115: gnu: gtkmm-2: Fix build., guix-commits, 2021/05/12
- 72/115: gnu: wayland: Update synopsis, description and license., guix-commits, 2021/05/12
- 73/115: gnu: wayland-protocols: Update description., guix-commits, 2021/05/12
- 85/115: gnu: ibus: Enable documentation., guix-commits, 2021/05/12
- 76/115: gnu: gtk+-2: Add missing inputs and search-path., guix-commits, 2021/05/12
- 94/115: gnu: gst-plugins-base: Enable more features., guix-commits, 2021/05/12
- 78/115: gnu: gtk+: Enable tests., guix-commits, 2021/05/12
- 75/115: gnu: gtk+-2: Enable tests., guix-commits, 2021/05/12