gnu: Adjust more packages to GLib "bin" split.

* gnu/packages/glib.scm (dbus-glib): Add glib-bin to 'native-inputs'.
  (glibmm): Likewise.
* gnu/packages/gstreamer.scm (gstreamer-0.10): Likewise.
* gnu/packages/gtk.scm (gtksourceview): Likewise.
* gnu/packages/qemu.scm (qemu-headless): Likewise.
* gnu/packages/gnome.scm (librsvg, libbonobo, libgnomecanvas,
  libgnomeprint): Likewise.
This commit is contained in:
Ludovic Courtès 2014-07-02 11:42:17 +02:00
parent 426adbe827
commit 44add1ce19
5 changed files with 16 additions and 6 deletions

View file

@ -321,7 +321,9 @@ (define dbus-glib
(inputs (inputs
`(("dbus" ,dbus) `(("dbus" ,dbus)
("expat" ,expat) ("expat" ,expat)
("glib" ,glib) ("glib" ,glib)))
(native-inputs
`(("glib" ,glib "bin")
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(home-page "http://dbus.freedesktop.org/doc/dbus-glib/") (home-page "http://dbus.freedesktop.org/doc/dbus-glib/")
(synopsis "D-Bus GLib bindings") (synopsis "D-Bus GLib bindings")
@ -385,7 +387,8 @@ (define glibmm
(("Gio::init.*$") (("Gio::init.*$")
"return 77;\n"))) "return 77;\n")))
%standard-phases))) %standard-phases)))
(inputs `(("pkg-config" ,pkg-config))) (inputs `(("pkg-config" ,pkg-config)
("glib" ,glib "bin")))
(propagated-inputs (propagated-inputs
`(("libsigc++" ,libsigc++) `(("libsigc++" ,libsigc++)
("glib" ,glib))) ("glib" ,glib)))

View file

@ -598,6 +598,7 @@ (define-public librsvg
%standard-phases))) %standard-phases)))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
("glib" ,glib "bin") ; glib-mkenums, etc.
("gobject-introspection" ,gobject-introspection))) ; g-ir-compiler, etc. ("gobject-introspection" ,gobject-introspection))) ; g-ir-compiler, etc.
(inputs (inputs
`(("pango" ,pango) `(("pango" ,pango)
@ -713,12 +714,13 @@ (define-public libbonobo
(inputs `(("popt" ,popt) (inputs `(("popt" ,popt)
("libxml2" ,libxml2))) ("libxml2" ,libxml2)))
;; The following are Required by the .pc file ;; The following are Required by the .pc file
(propagated-inputs (propagated-inputs
`(("glib" ,glib) `(("glib" ,glib)
("orbit2" ,orbit2))) ("orbit2" ,orbit2)))
(native-inputs (native-inputs
`(("intltool" ,intltool) `(("intltool" ,intltool)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("glib" ,glib "bin")
("flex" ,flex) ("flex" ,flex)
("bison" ,bison))) ("bison" ,bison)))
(home-page "https://developer.gnome.org/libbonobo/") (home-page "https://developer.gnome.org/libbonobo/")
@ -922,6 +924,7 @@ (define-public libgnomecanvas
("gtk+" ,gtk+-2))) ("gtk+" ,gtk+-2)))
(native-inputs (native-inputs
`(("intltool" ,intltool) `(("intltool" ,intltool)
("glib" ,glib "bin")
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(home-page "https://developer.gnome.org/libgnomecanvas/") (home-page "https://developer.gnome.org/libgnomecanvas/")
(synopsis "Flexible widget for creating interactive structured graphics") (synopsis "Flexible widget for creating interactive structured graphics")
@ -1007,9 +1010,10 @@ (define-public libgnomeprint
`(("popt" ,popt) `(("popt" ,popt)
("libart-lgpl" ,libart-lgpl) ("libart-lgpl" ,libart-lgpl)
("gtk+" ,gtk+-2) ("gtk+" ,gtk+-2)
("libxml2" ,libxml2))) ("libxml2" ,libxml2)))
(native-inputs (native-inputs
`(("intltool" ,intltool) `(("intltool" ,intltool)
("glib" ,glib "bin")
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(home-page "https://projects.gnome.org/gnome-print/home/faq.html") (home-page "https://projects.gnome.org/gnome-print/home/faq.html")
(synopsis "printing framework for GNOME") (synopsis "printing framework for GNOME")

View file

@ -61,7 +61,7 @@ (define-public gstreamer
"GStreamer is a library for constructing graphs of media-handling "GStreamer is a library for constructing graphs of media-handling
components. The applications it supports range from simple Ogg/Vorbis components. The applications it supports range from simple Ogg/Vorbis
playback, audio/video streaming to complex audio (mixing) and video playback, audio/video streaming to complex audio (mixing) and video
(non-linear editing) processing. (non-linear editing) processing.
Applications can take advantage of advances in codec and filter technology Applications can take advantage of advances in codec and filter technology
transparently. Developers can add new codecs and filters by writing a transparently. Developers can add new codecs and filters by writing a
@ -92,6 +92,7 @@ (define-public gstreamer-0.10
("flex" ,flex) ("flex" ,flex)
("perl" ,perl) ("perl" ,perl)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("glib" ,glib "bin")
("python" ,python-2))))) ("python" ,python-2)))))
(define-public gst-plugins-base (define-public gst-plugins-base

View file

@ -217,7 +217,8 @@ (define-public gtksourceview
("xorg-server" ,xorg-server) ("xorg-server" ,xorg-server)
("shared-mime-info" ,shared-mime-info))) ("shared-mime-info" ,shared-mime-info)))
(native-inputs (native-inputs
`(("intltool" ,intltool) `(("intltool" ,intltool)
("glib" ,glib "bin")
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(arguments (arguments
`(#:phases `(#:phases

View file

@ -106,6 +106,7 @@ (define-public qemu-headless
("attr" ,attr))) ("attr" ,attr)))
(native-inputs `(("pkg-config" ,pkg-config) (native-inputs `(("pkg-config" ,pkg-config)
("python" ,python-2) ; incompatible with Python 3 according to error message ("python" ,python-2) ; incompatible with Python 3 according to error message
("glib" ,glib "bin") ; gtester, etc.
("texinfo" ,texinfo) ("texinfo" ,texinfo)
("perl" ,perl))) ("perl" ,perl)))
(home-page "http://www.qemu-project.org") (home-page "http://www.qemu-project.org")