From fc595684db2197067f9c9c7912770f5c0d11e2b6 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 12 Mar 2021 08:32:10 -0500 Subject: [PATCH 51/68] 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. --- gnu/packages/gtk.scm | 45 +++++++++++++++++++++++++++++++------------- 1 file changed, 32 insertions(+), 13 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 6ee702de2a..aa11271756 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -938,44 +938,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 -- 2.30.1