From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Craven Subject: [PATCH 2/4] gnu: Rename 'glib' label to 'glib:bin' where appropriate. Date: Tue, 19 Jul 2016 18:49:14 +0200 Message-ID: <20160719164916.6597-3-david@craven.ch> References: <20160719164916.6597-1-david@craven.ch> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:44313) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bPYDu-00009p-1s for guix-devel@gnu.org; Tue, 19 Jul 2016 12:50:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bPYDr-0000bL-35 for guix-devel@gnu.org; Tue, 19 Jul 2016 12:50:21 -0400 Received: from so254-10.mailgun.net ([198.61.254.10]:55787) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bPYDp-0000a3-P6 for guix-devel@gnu.org; Tue, 19 Jul 2016 12:50:19 -0400 In-Reply-To: <20160719164916.6597-1-david@craven.ch> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org Cc: David Craven * gnu/packages/avahi.scm * gnu/packages/cups.scm * gnu/packages/geeqie.scm * gnu/packages/gimp.scm * gnu/packages/glib.scm * gnu/packages/gnome.scm * gnu/packages/gnucash.scm * gnu/packages/gstreamer.scm * gnu/packages/gtk.scm * gnu/packages/ibus.scm * gnu/packages/mail.scm * gnu/packages/pdf.scm * gnu/packages/qemu.scm * gnu/packages/statistics.scm * gnu/packages/terminals.scm * gnu/packages/wv.scm --- gnu/packages/avahi.scm | 2 +- gnu/packages/cups.scm | 2 +- gnu/packages/geeqie.scm | 2 +- gnu/packages/gimp.scm | 2 +- gnu/packages/glib.scm | 8 +++--- gnu/packages/gnome.scm | 60 ++++++++++++++++++++++----------------------- gnu/packages/gnucash.scm | 2 +- gnu/packages/gstreamer.scm | 4 +-- gnu/packages/gtk.scm | 16 ++++++------ gnu/packages/ibus.scm | 4 +-- gnu/packages/mail.scm | 2 +- gnu/packages/pdf.scm | 2 +- gnu/packages/qemu.scm | 2 +- gnu/packages/statistics.scm | 2 +- gnu/packages/terminals.scm | 2 +- gnu/packages/wv.scm | 2 +- 16 files changed, 57 insertions(+), 57 deletions(-) diff --git a/gnu/packages/avahi.scm b/gnu/packages/avahi.scm index 5740ab2..9de1f14 100644 --- a/gnu/packages/avahi.scm +++ b/gnu/packages/avahi.scm @@ -62,7 +62,7 @@ ("libdaemon" ,libdaemon))) (native-inputs `(("intltool" ,intltool) - ("glib" ,glib "bin") + ("glib:bin" ,glib "bin") ("pkg-config" ,pkg-config))) (synopsis "Implementation of mDNS/DNS-SD protocols") (description diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 8437170..fe51516 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -77,7 +77,7 @@ ,(string-append "--with-rcdir=" (assoc-ref %outputs "out") "/etc/rc.d")))) (native-inputs - `(("glib" ,glib "bin") ; for gdbus-codegen + `(("glib:bin" ,glib "bin") ; for gdbus-codegen ("pkg-config" ,pkg-config))) (inputs `(("fontconfig" ,fontconfig) diff --git a/gnu/packages/geeqie.scm b/gnu/packages/geeqie.scm index 110fb68..8fdb0f9 100644 --- a/gnu/packages/geeqie.scm +++ b/gnu/packages/geeqie.scm @@ -91,7 +91,7 @@ and XMP metadata of images in various formats.") (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) - ("glib" ,glib "bin") ; glib-gettextize + ("glib:bin" ,glib "bin") ; glib-gettextize ("intltool" ,intltool) ("pkg-config" ,pkg-config))) (home-page "http://www.geeqie.org/") diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index d5c58e2..cb6ae01 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -110,7 +110,7 @@ provided as well as the framework to add new color models and data types.") ("libjpeg" ,libjpeg-8))) (native-inputs `(("pkg-config" ,pkg-config) - ("glib" ,glib "bin") ; for gtester + ("glib:bin" ,glib "bin") ; for gtester ("intltool" ,intltool))) (home-page "http://gegl.org") (synopsis "Graph based image processing framework") diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index a85a565..9729a8f 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -299,7 +299,7 @@ dynamic loading, and an object system.") ("glib" ,glib) ("python-2" ,python-2))) (native-inputs - `(("glib" ,glib "bin") + `(("glib:bin" ,glib "bin") ("pkg-config" ,pkg-config))) (propagated-inputs `(;; In practice, GIR users will need libffi when using @@ -440,7 +440,7 @@ translated.") (inputs `(("expat" ,expat))) (native-inputs - `(("glib" ,glib "bin") + `(("glib:bin" ,glib "bin") ("pkg-config" ,pkg-config))) (home-page "http://dbus.freedesktop.org/doc/dbus-glib/") (synopsis "D-Bus GLib bindings") @@ -507,7 +507,7 @@ has an ease of use unmatched by other C++ callback libraries.") "return 77;\n"))) %standard-phases))) (native-inputs `(("pkg-config" ,pkg-config) - ("glib" ,glib "bin"))) + ("glib:bin" ,glib "bin"))) (propagated-inputs `(("libsigc++" ,libsigc++) ("glib" ,glib))) @@ -639,7 +639,7 @@ useful for C++.") (arguments '(#:configure-flags '("--enable-vala-bindings"))) (native-inputs - `(("glib" ,glib "bin") ; uses glib-mkenums + `(("glib:bin" ,glib "bin") ; uses glib-mkenums ("gobject-introspection" ,gobject-introspection) ("pkg-config" ,pkg-config) ("python" ,python-2) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 9335005..2dca93d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -142,7 +142,7 @@ `(("hicolor-icon-theme" ,hicolor-icon-theme))) (native-inputs `(("intltool" ,intltool) - ("glib" ,glib "bin") ; glib-compile-schemas, etc. + ("glib:bin" ,glib "bin") ; glib-compile-schemas, etc. ("gobject-introspection" ,gobject-introspection) ("pkg-config" ,pkg-config))) (inputs @@ -186,7 +186,7 @@ features to enable users to create their discs easily and quickly.") "1b4bba0k8ph4cwgw8xjglss0p6n111bpd5app67lrq79mp0ad06l")))) (build-system gnu-build-system) (inputs - `(("glib" ,glib "bin") + `(("glib:bin" ,glib "bin") ("pango" ,pango) ("gdk-pixbuf" ,gdk-pixbuf) ("gtk+" ,gtk+-2) @@ -343,7 +343,7 @@ and keep up to date translations of documentation.") (native-inputs `(("python" ,python-2) ;for tests ("pkg-config" ,pkg-config) - ("glib" ,glib "bin") + ("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) ("intltool" ,intltool) ("xsltproc" ,libxslt))) @@ -378,7 +378,7 @@ GNOME Desktop.") ("dbus" ,dbus))) (native-inputs `(("pkg-config" ,pkg-config) - ("glib" ,glib "bin") + ("glib:bin" ,glib "bin") ("intltool" ,intltool))) (propagated-inputs ;; Referred to in .h files and .pc. @@ -439,7 +439,7 @@ GNOME Desktop.") ("gcr" ,gcr))) (native-inputs `(("pkg-config" ,pkg-config) - ("glib" ,glib "bin") + ("glib:bin" ,glib "bin") ("python" ,python-2) ;for tests ("intltool" ,intltool) ("autoconf" ,autoconf) @@ -510,7 +510,7 @@ forgotten when the session ends.") (native-inputs `(("itstool" ,itstool) ("intltool" ,intltool) - ("glib" ,glib "bin") + ("glib:bin" ,glib "bin") ("pkg-config" ,pkg-config) ("xmllint" ,libxml2))) (home-page @@ -541,7 +541,7 @@ on the GNOME Desktop with a single simple application.") `(("glib" ,glib))) (native-inputs `(("intltool" ,intltool) - ("glib" ,glib "bin") ; glib-compile-schemas, etc. + ("glib:bin" ,glib "bin") ; glib-compile-schemas, etc. ("gobject-introspection" ,gobject-introspection) ("pkg-config" ,pkg-config))) (home-page "https://launchpad.net/gsettings-desktop-schemas") @@ -735,7 +735,7 @@ database is translated at Transifex.") ("libpng" ,libpng))) (native-inputs `(("pkg-config" ,pkg-config) - ("glib" ,glib "bin") + ("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection))) (home-page "https://developer-next.gnome.org/libnotify/") (synopsis @@ -801,7 +801,7 @@ the API.") ("libx11" ,libx11) ("libxt" ,libxt))) (native-inputs `(("pkg-config" ,pkg-config) - ("glib" ,glib "bin"))) + ("glib:bin" ,glib "bin"))) (propagated-inputs `(("pangox-compat" ,pangox-compat))) (home-page "https://projects.gnome.org/gtkglext") (synopsis "OpenGL extension to GTK+") @@ -948,7 +948,7 @@ dealing with different structured file formats.") %standard-phases))) (native-inputs `(("pkg-config" ,pkg-config) - ("glib" ,glib "bin") ; glib-mkenums, etc. + ("glib:bin" ,glib "bin") ; glib-mkenums, etc. ("gobject-introspection" ,gobject-introspection))) ; g-ir-compiler, etc. (inputs `(("pango" ,pango) @@ -1073,7 +1073,7 @@ featuring mature C, C++ and Python bindings.") (native-inputs `(("intltool" ,intltool) ("pkg-config" ,pkg-config) - ("glib" ,glib "bin") ; for glib-genmarshal, etc. + ("glib:bin" ,glib "bin") ; for glib-genmarshal, etc. ("flex" ,flex) ("bison" ,bison))) (home-page "https://developer.gnome.org/libbonobo/") @@ -1106,7 +1106,7 @@ use in GNOME applications, built on top of CORBA.") ("orbit2" ,orbit2))) (native-inputs `(("intltool" ,intltool) - ("glib" ,glib "bin") ; for glib-genmarshal, etc. + ("glib:bin" ,glib "bin") ; for glib-genmarshal, etc. ("pkg-config" ,pkg-config))) (home-page "https://projects.gnome.org/gconf/") (synopsis "Store application preferences") @@ -1173,7 +1173,7 @@ designed to be accessed through the MIME functions in GnomeVFS.") ("gnome-mime-data" ,gnome-mime-data) ("zlib" ,zlib))) (native-inputs - `(("glib" ,glib "bin") ; for glib-mkenums, etc. + `(("glib:bin" ,glib "bin") ; for glib-mkenums, etc. ("intltool" ,intltool) ("pkg-config" ,pkg-config))) (home-page "https://developer.gnome.org/gnome-vfs/") @@ -1209,7 +1209,7 @@ to access local and remote files with a single consistent API.") %standard-phases))) (inputs `(("libxml2" ,libxml2))) (native-inputs - `(("glib" ,glib "bin") ; for glib-mkenums, etc. + `(("glib:bin" ,glib "bin") ; for glib-mkenums, etc. ("intltool" ,intltool) ("pkg-config" ,pkg-config))) ;; The following are listed as Required in the .pc file @@ -1272,7 +1272,7 @@ high-quality vector-based 2D library with antialiasing and alpha composition.") ("gtk+" ,gtk+-2))) (native-inputs `(("intltool" ,intltool) - ("glib" ,glib "bin") ; for glib-genmarshal, etc. + ("glib:bin" ,glib "bin") ; for glib-genmarshal, etc. ("pkg-config" ,pkg-config))) (home-page "https://developer.gnome.org/libgnomecanvas/") (synopsis "Flexible widget for creating interactive structured graphics") @@ -1328,7 +1328,7 @@ creating interactive structured graphics.") ("libxml2" ,libxml2) ("libglade" ,libglade))) (native-inputs - `(("glib" ,glib "bin") ; for glib-mkenums, etc. + `(("glib:bin" ,glib "bin") ; for glib-mkenums, etc. ("intltool" ,intltool) ("pkg-config" ,pkg-config))) (home-page "https://developer.gnome.org/libgnomeui/") @@ -1387,7 +1387,7 @@ widgets built in the loading process.") ("libxml2" ,libxml2))) (native-inputs `(("intltool" ,intltool) - ("glib" ,glib "bin") ; for glib-genmarshal, etc. + ("glib:bin" ,glib "bin") ; for glib-genmarshal, etc. ("pkg-config" ,pkg-config))) (home-page "https://projects.gnome.org/gnome-print/home/faq.html") (synopsis "Printing framework for GNOME") @@ -1462,7 +1462,7 @@ since ca. 2006, when GTK+ itself incorporated printing support.") ("libgnomecanvas" ,libgnomecanvas) ("libglade" ,libglade))) (native-inputs - `(("glib" ,glib "bin") ; for glib-genmarshal, etc. + `(("glib:bin" ,glib "bin") ; for glib-genmarshal, etc. ("intltool" ,intltool) ("xorg-server" ,xorg-server) ; For running the tests ("pkg-config" ,pkg-config))) @@ -1544,7 +1544,7 @@ Hints specification (EWMH).") ("libxml2" ,libxml2))) (native-inputs `(("intltool" ,intltool) - ("glib" ,glib "bin") + ("glib:bin" ,glib "bin") ("pkg-config" ,pkg-config))) (home-page "https://developer.gnome.org/goffice/") (synopsis "Document-centric objects and utilities") @@ -1776,7 +1776,7 @@ libraries written in C.") ("intltool" ,intltool) ("vala" ,vala) ("gobject-introspection" ,gobject-introspection) - ("glib" ,glib "bin") ; for glib-genmarshal, etc. + ("glib:bin" ,glib "bin") ; for glib-genmarshal, etc. ("xmllint" ,libxml2))) (propagated-inputs `(("gtk+" ,gtk+) ;required by vte-2.91.pc @@ -1865,7 +1865,7 @@ selection and URL hints."))) (native-inputs `(("pkg-config" ,pkg-config) ("intltool" ,intltool) - ("glib" ,glib "bin"))) ; for glib-genmarshal, etc. + ("glib:bin" ,glib "bin"))) ; for glib-genmarshal, etc. (propagated-inputs `(("gtk+" ,gtk+-2) ; required by libvte.pc ("ncurses" ,ncurses))))) ; required by libvte.la @@ -1945,7 +1945,7 @@ configuration storage systems.") "\"/builder/empty\", test_builder_empty"))))) (build-system gnu-build-system) (native-inputs - `(("glib" ,glib "bin") ;for glib-mkenums and glib-genmarshal + `(("glib:bin" ,glib "bin") ;for glib-mkenums and glib-genmarshal ("gobject-introspection" ,gobject-introspection) ("pkg-config" ,pkg-config))) (propagated-inputs @@ -2677,7 +2677,7 @@ settings, themes, mouse settings, and startup of other daemons.") `(#:tests? #f)) (native-inputs `(("intltool" ,intltool) - ("glib" ,glib "bin") + ("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) ("pkg-config" ,pkg-config))) (propagated-inputs @@ -3298,7 +3298,7 @@ which can read a large number of file formats.") (native-inputs `(("itstool" ,itstool) ("intltool" ,intltool) - ("glib" ,glib "bin") + ("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) ("desktop-file-utils" ,desktop-file-utils) ("pkg-config" ,pkg-config) @@ -3374,7 +3374,7 @@ supports playlists, song ratings, and any codecs installed through gstreamer.") (native-inputs `(("intltool" ,intltool) ("itstool" ,itstool) - ("glib" ,glib "bin") + ("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) ("pkg-config" ,pkg-config) ("xmllint" ,libxml2))) @@ -3547,7 +3547,7 @@ USB transfers with your high-level application or system daemon.") `(("intltool" ,intltool) ("itstool" ,itstool) ("colord" ,colord) - ("glib" ,glib "bin") ; glib-compile-schemas, etc. + ("glib:bin" ,glib "bin") ; glib-compile-schemas, etc. ("pkg-config" ,pkg-config) ("vala" ,vala) ("xmllint" ,libxml2))) @@ -3795,7 +3795,7 @@ wraps things up in a developer-friendly way.") (("@INTROSPECTION_TYPELIBDIR@") (string-append out "/lib/girepository-1.0/"))))))))) (native-inputs - `(("glib" ,glib "bin") + `(("glib:bin" ,glib "bin") ("pkg-config" ,pkg-config))) (inputs `(("glib" ,glib) @@ -3821,7 +3821,7 @@ classes for commonly used data structures.") "121r5lv6l82pjr0ycdf2b01mdwy7sxwca2r068zrzylpc6bgn31r")))) (build-system gnu-build-system) (native-inputs - `(("glib" ,glib "bin") + `(("glib:bin" ,glib "bin") ("pkg-config" ,pkg-config))) (propagated-inputs ;; Listed in "Requires" section of gexiv2.pc @@ -4892,7 +4892,7 @@ files.") ("pkg-config" ,pkg-config) ("itstool" ,itstool) ("xmllint" ,libxml2) - ("glib" ,glib "bin") + ("glib:bin" ,glib "bin") ("vala" ,vala))) (inputs `(("gtk+" ,gtk+))) @@ -5212,7 +5212,7 @@ GNOME Shell appearance and extension, etc.") ("pkg-config" ,pkg-config))) (propagated-inputs `(("glib" ,glib) - ("glib" ,glib "bin"))) + ("glib:bin" ,glib "bin"))) (synopsis "Extensions for GNOME Shell") (description "GNOME Shell extensions modify and extend GNOME Shell functionality and behavior.") diff --git a/gnu/packages/gnucash.scm b/gnu/packages/gnucash.scm index eaa84cc..0af1f47 100644 --- a/gnu/packages/gnucash.scm +++ b/gnu/packages/gnucash.scm @@ -67,7 +67,7 @@ ("perl-date-manip" ,perl-date-manip) ("perl-finance-quote" ,perl-finance-quote))) (native-inputs - `(("glib" ,glib "bin") ; glib-compile-schemas, etc. + `(("glib:bin" ,glib "bin") ; glib-compile-schemas, etc. ("intltool" ,intltool) ("pkg-config" ,pkg-config))) (arguments diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index a39a3b4..9f26b0c 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -118,7 +118,7 @@ arrays of data.") (native-inputs `(("bison" ,bison) ("flex" ,flex) - ("glib" ,glib "bin") + ("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) ("perl" ,perl) ("pkg-config" ,pkg-config) @@ -172,7 +172,7 @@ This package provides the core library and elements.") ("alsa-lib" ,alsa-lib))) (native-inputs `(("pkg-config" ,pkg-config) - ("glib" ,glib "bin") + ("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) ("python-wrapper" ,python-wrapper))) (arguments diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index e237c6a..d0060e8 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -86,7 +86,7 @@ (propagated-inputs `(("glib" ,glib))) ; required by atk.pc (native-inputs `(("pkg-config" ,pkg-config) - ("glib" ,glib "bin") ; glib-mkenums, etc. + ("glib:bin" ,glib "bin") ; glib-mkenums, etc. ("gobject-introspection" ,gobject-introspection))) ; g-ir-compiler, etc. (synopsis "GNOME accessibility toolkit") (description @@ -210,7 +210,7 @@ affine transformation (scale, rotation, shear, etc.).") ("libxft" ,libxft))) (native-inputs `(("pkg-config" ,pkg-config) - ("glib" ,glib "bin") ; glib-mkenums, etc. + ("glib:bin" ,glib "bin") ; glib-mkenums, etc. ("gobject-introspection" ,gobject-introspection))) ; g-ir-compiler, etc. (synopsis "GNOME text and font handling library") (description @@ -274,7 +274,7 @@ functions which were removed.") `(("gtk" ,gtk+-2) ("gtkmm" ,gtkmm-2))) (native-inputs - `(("glib" ,glib "bin") ; for glib-genmarshal, etc. + `(("glib:bin" ,glib "bin") ; for glib-genmarshal, etc. ("pkg-config" ,pkg-config))) (home-page "http://drobilla.net/software/ganv/") (synopsis "GTK+ widget for interactive graph-like environments") @@ -304,7 +304,7 @@ diagrams.") ("shared-mime-info" ,shared-mime-info))) (native-inputs `(("intltool" ,intltool) - ("glib" ,glib "bin") ; for glib-genmarshal, etc. + ("glib:bin" ,glib "bin") ; for glib-genmarshal, etc. ("pkg-config" ,pkg-config))) (propagated-inputs ;; As per the pkg-config file. @@ -431,7 +431,7 @@ highlighting and other features typical of a source code editor.") ("libx11" ,libx11))) (native-inputs `(("pkg-config" ,pkg-config) - ("glib" ,glib "bin") ; glib-mkenums, etc. + ("glib:bin" ,glib "bin") ; glib-mkenums, etc. ("gobject-introspection" ,gobject-introspection))) ; g-ir-compiler, etc. (synopsis "GNOME image loading and manipulation library") (description @@ -580,7 +580,7 @@ is part of the GNOME accessibility project.") (native-inputs `(("perl" ,perl) ("gettext" ,gnu-gettext) - ("glib" ,glib "bin") + ("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) ("pkg-config" ,pkg-config) ("python-wrapper" ,python-wrapper))) @@ -645,7 +645,7 @@ application suites.") ("json-glib" ,json-glib))) (native-inputs `(("perl" ,perl) - ("glib" ,glib "bin") + ("glib:bin" ,glib "bin") ("gettext" ,gnu-gettext) ("pkg-config" ,pkg-config) ("gobject-introspection" ,gobject-introspection) @@ -974,7 +974,7 @@ toolkit.") "04n631a127pyidaz82ypdy9syq1hzj636r32y9hyr9kcfnwf2785")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) - ("glib" ,glib "bin") ;for 'glib-compile-resources' + ("glib:bin" ,glib "bin") ;for 'glib-compile-resources' ("xorg-server" ,xorg-server))) (propagated-inputs `(("pangomm" ,pangomm) diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index db7d084..3718e43 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -92,7 +92,7 @@ ("pygobject2" ,python2-pygobject) ("python2" ,python-2))) (native-inputs - `(("glib" ,glib "bin") ; for glib-genmarshal + `(("glib:bin" ,glib "bin") ; for glib-genmarshal ("gobject-introspection" ,gobject-introspection) ; for g-ir-compiler ("pkg-config" ,pkg-config))) (native-search-paths @@ -153,7 +153,7 @@ may also simplify input method development.") ("intltool" ,intltool) ("autoconf" ,autoconf) ("automake" ,automake) - ("glib" ,glib "bin") + ("glib:bin" ,glib "bin") ("libtool" ,libtool))) (synopsis "Chinese Pinyin and ZhuYin input methods for IBus") (description diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 5a3ebf0..f7c499e 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -342,7 +342,7 @@ repository and Maildir/IMAP as LOCAL repository.") (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) - ("glib" ,glib "bin") ; for gtester + ("glib:bin" ,glib "bin") ; for gtester ("autoconf" ,autoconf) ("automake" ,automake) ("emacs" ,emacs-minimal) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 36d3985..1df9ae2 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -82,7 +82,7 @@ ("glib" ,glib))) (native-inputs `(("pkg-config" ,pkg-config) - ("glib" ,glib "bin") ; glib-mkenums, etc. + ("glib:bin" ,glib "bin") ; glib-mkenums, etc. ("gobject-introspection" ,gobject-introspection))) (arguments `(#:tests? #f ; no test data provided with the tarball diff --git a/gnu/packages/qemu.scm b/gnu/packages/qemu.scm index 4d78f9b..e67f614 100644 --- a/gnu/packages/qemu.scm +++ b/gnu/packages/qemu.scm @@ -138,7 +138,7 @@ ("attr" ,attr))) (native-inputs `(("pkg-config" ,pkg-config) ("python" ,python-2) ; incompatible with Python 3 according to error message - ("glib" ,glib "bin") ; gtester, etc. + ("glib:bin" ,glib "bin") ; gtester, etc. ("texinfo" ,texinfo) ("perl" ,perl))) (home-page "http://www.qemu-project.org") diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 45e50b6..4a5a1f1 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -83,7 +83,7 @@ ("gtksourceview" ,gtksourceview) ("zlib" ,zlib))) (native-inputs - `(("glib" ,glib "bin") ;for glib-genmarshal + `(("glib:bin" ,glib "bin") ;for glib-genmarshal ("perl" ,perl) ("pkg-config" ,pkg-config))) (home-page "http://www.gnu.org/software/pspp/") diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index ee36f64..efc90e5 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -60,7 +60,7 @@ ("gettext" ,gnu-gettext) ("pkg-config" ,pkg-config))) (inputs - `(("glib" ,glib "bin") + `(("glib:bin" ,glib "bin") ("gtk+" ,gtk+) ("libconfuse" ,libconfuse) ("vte" ,vte))) diff --git a/gnu/packages/wv.scm b/gnu/packages/wv.scm index a7f2944..80db181 100644 --- a/gnu/packages/wv.scm +++ b/gnu/packages/wv.scm @@ -51,7 +51,7 @@ ("libwmf" ,libwmf) ("zlib" ,zlib))) (native-inputs - `(("glib" ,glib "bin") + `(("glib:bin" ,glib "bin") ("pkg-config" ,pkg-config))) (synopsis "Microsoft Word conversion library and utilities") (description -- 2.9.0