gnu: glib: Add "bin" output.
Fixes <http://bugs.gnu.org/17853>. * gnu/packages/glib.scm (glib)[outputs]: Add "bin". (gobject-introspection)[native-inputs]: New field. * gnu/packages/avahi.scm (avahi)[native-inputs]: Add glib:bin. * gnu/packages/gnome.scm (brasero, libgnome-keyring, evince, gsettings-desktop-schemas, libnotify, gtkglext): Likewise. * gnu/packages/gstreamer.scm (gstreamer, gst-plugins-base, gst-plugins-base-0.10): Likewise. * gnu/packages/gtk.scm (atk, pango, gdk-pixbuf, gtk+-2, gtk+): Likewise. * gnu/packages/linux.scm (udev): Likewise. * gnu/packages/pdf.scm (poppler): Likewise.
This commit is contained in:
		
							parent
							
								
									1ddbd9fd71
								
							
						
					
					
						commit
						426adbe827
					
				
					 7 changed files with 27 additions and 10 deletions
				
			
		| 
						 | 
					@ -1,5 +1,5 @@
 | 
				
			||||||
;;; GNU Guix --- Functional package management for GNU
 | 
					;;; GNU Guix --- Functional package management for GNU
 | 
				
			||||||
;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org>
 | 
					;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org>
 | 
				
			||||||
;;;
 | 
					;;;
 | 
				
			||||||
;;; This file is part of GNU Guix.
 | 
					;;; This file is part of GNU Guix.
 | 
				
			||||||
;;;
 | 
					;;;
 | 
				
			||||||
| 
						 | 
					@ -60,6 +60,7 @@
 | 
				
			||||||
       ("libdaemon" ,libdaemon)))
 | 
					       ("libdaemon" ,libdaemon)))
 | 
				
			||||||
    (native-inputs
 | 
					    (native-inputs
 | 
				
			||||||
     `(("intltool" ,intltool)
 | 
					     `(("intltool" ,intltool)
 | 
				
			||||||
 | 
					       ("glib" ,glib "bin")
 | 
				
			||||||
       ("pkg-config" ,pkg-config)))
 | 
					       ("pkg-config" ,pkg-config)))
 | 
				
			||||||
    (synopsis "Avahi, an mDNS/DNS-SD implementation")
 | 
					    (synopsis "Avahi, an mDNS/DNS-SD implementation")
 | 
				
			||||||
    (description
 | 
					    (description
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -119,8 +119,9 @@ shared NFS home directories.")
 | 
				
			||||||
                           (search-patch "glib-tests-prlimit.patch")
 | 
					                           (search-patch "glib-tests-prlimit.patch")
 | 
				
			||||||
                           (search-patch "glib-tests-newnet.patch")))))
 | 
					                           (search-patch "glib-tests-newnet.patch")))))
 | 
				
			||||||
   (build-system gnu-build-system)
 | 
					   (build-system gnu-build-system)
 | 
				
			||||||
   (outputs '("out"                        ; everything
 | 
					   (outputs '("out"           ; everything
 | 
				
			||||||
              "doc"))                      ; 20 MiB of GTK-Doc reference
 | 
					              "bin"           ; glib-mkenums, gtester, etc.; depends on Python
 | 
				
			||||||
 | 
					              "doc"))         ; 20 MiB of GTK-Doc reference
 | 
				
			||||||
   (inputs
 | 
					   (inputs
 | 
				
			||||||
    `(("coreutils" ,coreutils)
 | 
					    `(("coreutils" ,coreutils)
 | 
				
			||||||
      ("libffi" ,libffi)
 | 
					      ("libffi" ,libffi)
 | 
				
			||||||
| 
						 | 
					@ -201,6 +202,8 @@ dynamic loading, and an object system.")
 | 
				
			||||||
       ("glib" ,glib)
 | 
					       ("glib" ,glib)
 | 
				
			||||||
       ("pkg-config" ,pkg-config)
 | 
					       ("pkg-config" ,pkg-config)
 | 
				
			||||||
       ("python-2" ,python-2)))
 | 
					       ("python-2" ,python-2)))
 | 
				
			||||||
 | 
					    (native-inputs
 | 
				
			||||||
 | 
					     `(("glib" ,glib "bin")))
 | 
				
			||||||
    (propagated-inputs
 | 
					    (propagated-inputs
 | 
				
			||||||
     `(;; In practice, GIR users will need libffi when using
 | 
					     `(;; In practice, GIR users will need libffi when using
 | 
				
			||||||
       ;; gobject-introspection.
 | 
					       ;; gobject-introspection.
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -60,6 +60,7 @@
 | 
				
			||||||
     `(("hicolor-icon-theme" ,hicolor-icon-theme)))
 | 
					     `(("hicolor-icon-theme" ,hicolor-icon-theme)))
 | 
				
			||||||
    (native-inputs
 | 
					    (native-inputs
 | 
				
			||||||
     `(("intltool" ,intltool)
 | 
					     `(("intltool" ,intltool)
 | 
				
			||||||
 | 
					       ("glib" ,glib "bin")                       ; glib-compile-schemas, etc.
 | 
				
			||||||
       ("pkg-config" ,pkg-config)))
 | 
					       ("pkg-config" ,pkg-config)))
 | 
				
			||||||
    (inputs
 | 
					    (inputs
 | 
				
			||||||
     `(("glib" ,glib)
 | 
					     `(("glib" ,glib)
 | 
				
			||||||
| 
						 | 
					@ -73,9 +74,6 @@
 | 
				
			||||||
       ("libnotify" ,libnotify)
 | 
					       ("libnotify" ,libnotify)
 | 
				
			||||||
       ("libsm" ,libsm)
 | 
					       ("libsm" ,libsm)
 | 
				
			||||||
       ("libxml2" ,libxml2)))
 | 
					       ("libxml2" ,libxml2)))
 | 
				
			||||||
    (native-inputs
 | 
					 | 
				
			||||||
     `(("intltool" ,intltool)
 | 
					 | 
				
			||||||
       ("pkg-config" ,pkg-config)))
 | 
					 | 
				
			||||||
    (home-page "https://projects.gnome.org/brasero/")
 | 
					    (home-page "https://projects.gnome.org/brasero/")
 | 
				
			||||||
    (synopsis "CD/DVD burning tool for Gnome")
 | 
					    (synopsis "CD/DVD burning tool for Gnome")
 | 
				
			||||||
    (description "Brasero is an application to burn CD/DVD for the Gnome
 | 
					    (description "Brasero is an application to burn CD/DVD for the Gnome
 | 
				
			||||||
| 
						 | 
					@ -173,6 +171,7 @@ and keep up to date translations of documentation.")
 | 
				
			||||||
       ("dbus" ,dbus)))
 | 
					       ("dbus" ,dbus)))
 | 
				
			||||||
    (native-inputs
 | 
					    (native-inputs
 | 
				
			||||||
     `(("pkg-config" ,pkg-config)
 | 
					     `(("pkg-config" ,pkg-config)
 | 
				
			||||||
 | 
					       ("glib" ,glib "bin")
 | 
				
			||||||
       ("intltool" ,intltool)))
 | 
					       ("intltool" ,intltool)))
 | 
				
			||||||
    (propagated-inputs
 | 
					    (propagated-inputs
 | 
				
			||||||
     ;; Referred to in .h files and .pc.
 | 
					     ;; Referred to in .h files and .pc.
 | 
				
			||||||
| 
						 | 
					@ -239,6 +238,7 @@ and keep up to date translations of documentation.")
 | 
				
			||||||
       ("dogtail" ,python2-dogtail)))
 | 
					       ("dogtail" ,python2-dogtail)))
 | 
				
			||||||
    (native-inputs
 | 
					    (native-inputs
 | 
				
			||||||
     `(("intltool" ,intltool)
 | 
					     `(("intltool" ,intltool)
 | 
				
			||||||
 | 
					       ("glib" ,glib "bin")
 | 
				
			||||||
       ("pkg-config" ,pkg-config)))
 | 
					       ("pkg-config" ,pkg-config)))
 | 
				
			||||||
    (home-page
 | 
					    (home-page
 | 
				
			||||||
     "http://www.gnome.org/projects/evince/")
 | 
					     "http://www.gnome.org/projects/evince/")
 | 
				
			||||||
| 
						 | 
					@ -268,6 +268,7 @@ on the GNOME Desktop with a single simple application.")
 | 
				
			||||||
     `(("glib" ,glib)))
 | 
					     `(("glib" ,glib)))
 | 
				
			||||||
    (native-inputs
 | 
					    (native-inputs
 | 
				
			||||||
     `(("intltool" ,intltool)
 | 
					     `(("intltool" ,intltool)
 | 
				
			||||||
 | 
					       ("glib" ,glib "bin")                       ; glib-compile-schemas, etc.
 | 
				
			||||||
       ("pkg-config" ,pkg-config)))
 | 
					       ("pkg-config" ,pkg-config)))
 | 
				
			||||||
    (home-page "https://launchpad.net/gsettings-desktop-schemas")
 | 
					    (home-page "https://launchpad.net/gsettings-desktop-schemas")
 | 
				
			||||||
    (synopsis
 | 
					    (synopsis
 | 
				
			||||||
| 
						 | 
					@ -402,7 +403,8 @@ database is translated at Transifex.")
 | 
				
			||||||
       ("gtk+" ,gtk+)
 | 
					       ("gtk+" ,gtk+)
 | 
				
			||||||
       ("libpng" ,libpng)))
 | 
					       ("libpng" ,libpng)))
 | 
				
			||||||
    (native-inputs
 | 
					    (native-inputs
 | 
				
			||||||
      `(("pkg-config" ,pkg-config)))
 | 
					      `(("pkg-config" ,pkg-config)
 | 
				
			||||||
 | 
					        ("glib" ,glib "bin")))
 | 
				
			||||||
    (home-page "https://developer-next.gnome.org/libnotify/")
 | 
					    (home-page "https://developer-next.gnome.org/libnotify/")
 | 
				
			||||||
    (synopsis
 | 
					    (synopsis
 | 
				
			||||||
     "GNOME desktop notification library")
 | 
					     "GNOME desktop notification library")
 | 
				
			||||||
| 
						 | 
					@ -465,7 +467,8 @@ the API")
 | 
				
			||||||
              ("mesa" ,mesa)
 | 
					              ("mesa" ,mesa)
 | 
				
			||||||
              ("libx11" ,libx11)
 | 
					              ("libx11" ,libx11)
 | 
				
			||||||
              ("libxt" ,libxt)))
 | 
					              ("libxt" ,libxt)))
 | 
				
			||||||
    (native-inputs `(("pkg-config" ,pkg-config)))
 | 
					    (native-inputs `(("pkg-config" ,pkg-config)
 | 
				
			||||||
 | 
					                     ("glib" ,glib "bin")))
 | 
				
			||||||
    (propagated-inputs `(("pangox-compat" ,pangox-compat)))
 | 
					    (propagated-inputs `(("pangox-compat" ,pangox-compat)))
 | 
				
			||||||
    (home-page "https://projects.gnome.org/gtkglext")
 | 
					    (home-page "https://projects.gnome.org/gtkglext")
 | 
				
			||||||
    (synopsis "OpenGL extension to GTK+.")
 | 
					    (synopsis "OpenGL extension to GTK+.")
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -51,6 +51,7 @@
 | 
				
			||||||
    (native-inputs
 | 
					    (native-inputs
 | 
				
			||||||
     `(("bison" ,bison)
 | 
					     `(("bison" ,bison)
 | 
				
			||||||
       ("flex" ,flex)
 | 
					       ("flex" ,flex)
 | 
				
			||||||
 | 
					       ("glib" ,glib "bin")
 | 
				
			||||||
       ("perl" ,perl)
 | 
					       ("perl" ,perl)
 | 
				
			||||||
       ("pkg-config" ,pkg-config)
 | 
					       ("pkg-config" ,pkg-config)
 | 
				
			||||||
       ("python-wrapper" ,python-wrapper)))
 | 
					       ("python-wrapper" ,python-wrapper)))
 | 
				
			||||||
| 
						 | 
					@ -112,6 +113,7 @@ This package provides the core library and elements.")
 | 
				
			||||||
       ("gstreamer" ,gstreamer)))
 | 
					       ("gstreamer" ,gstreamer)))
 | 
				
			||||||
    (native-inputs
 | 
					    (native-inputs
 | 
				
			||||||
      `(("pkg-config" ,pkg-config)
 | 
					      `(("pkg-config" ,pkg-config)
 | 
				
			||||||
 | 
					        ("glib" ,glib "bin")
 | 
				
			||||||
        ("python-wrapper" ,python-wrapper)))
 | 
					        ("python-wrapper" ,python-wrapper)))
 | 
				
			||||||
    (arguments
 | 
					    (arguments
 | 
				
			||||||
     `(#:tests? #f))
 | 
					     `(#:tests? #f))
 | 
				
			||||||
| 
						 | 
					@ -154,4 +156,5 @@ This package provides an essential exemplary set of elements.")
 | 
				
			||||||
       ("gstreamer" ,gstreamer-0.10)))
 | 
					       ("gstreamer" ,gstreamer-0.10)))
 | 
				
			||||||
    (native-inputs
 | 
					    (native-inputs
 | 
				
			||||||
      `(("pkg-config" ,pkg-config)
 | 
					      `(("pkg-config" ,pkg-config)
 | 
				
			||||||
       ("python" ,python-2)))))
 | 
					        ("glib" ,glib "bin")
 | 
				
			||||||
 | 
					        ("python" ,python-2)))))
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -54,6 +54,7 @@
 | 
				
			||||||
   (inputs `(("glib" ,glib)))
 | 
					   (inputs `(("glib" ,glib)))
 | 
				
			||||||
   (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.
 | 
				
			||||||
   (synopsis "GNOME accessibility toolkit")
 | 
					   (synopsis "GNOME accessibility toolkit")
 | 
				
			||||||
   (description
 | 
					   (description
 | 
				
			||||||
| 
						 | 
					@ -158,6 +159,7 @@ affine transformation (scale, rotation, shear, etc.)")
 | 
				
			||||||
    `(("zlib" ,zlib)))
 | 
					    `(("zlib" ,zlib)))
 | 
				
			||||||
   (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.
 | 
				
			||||||
   (synopsis "GNOME text and font handling library")
 | 
					   (synopsis "GNOME text and font handling library")
 | 
				
			||||||
   (description
 | 
					   (description
 | 
				
			||||||
| 
						 | 
					@ -267,6 +269,7 @@ printing and other features typical of a source code editor.")
 | 
				
			||||||
      ("libtiff" ,libtiff)))
 | 
					      ("libtiff" ,libtiff)))
 | 
				
			||||||
   (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.
 | 
				
			||||||
   (synopsis "GNOME image loading and manipulation library")
 | 
					   (synopsis "GNOME image loading and manipulation library")
 | 
				
			||||||
   (description
 | 
					   (description
 | 
				
			||||||
| 
						 | 
					@ -353,6 +356,7 @@ is part of the GNOME accessibility project.")
 | 
				
			||||||
      ("pango" ,pango)))
 | 
					      ("pango" ,pango)))
 | 
				
			||||||
   (native-inputs
 | 
					   (native-inputs
 | 
				
			||||||
    `(("perl" ,perl)
 | 
					    `(("perl" ,perl)
 | 
				
			||||||
 | 
					      ("glib" ,glib "bin")
 | 
				
			||||||
      ("pkg-config" ,pkg-config)
 | 
					      ("pkg-config" ,pkg-config)
 | 
				
			||||||
      ("python-wrapper" ,python-wrapper)))
 | 
					      ("python-wrapper" ,python-wrapper)))
 | 
				
			||||||
   (arguments
 | 
					   (arguments
 | 
				
			||||||
| 
						 | 
					@ -395,6 +399,7 @@ application suites.")
 | 
				
			||||||
    `(("libxml2" ,libxml2)))
 | 
					    `(("libxml2" ,libxml2)))
 | 
				
			||||||
   (native-inputs
 | 
					   (native-inputs
 | 
				
			||||||
    `(("perl" ,perl)
 | 
					    `(("perl" ,perl)
 | 
				
			||||||
 | 
					      ("glib" ,glib "bin")
 | 
				
			||||||
      ("pkg-config" ,pkg-config)
 | 
					      ("pkg-config" ,pkg-config)
 | 
				
			||||||
      ("gobject-introspection" ,gobject-introspection)
 | 
					      ("gobject-introspection" ,gobject-introspection)
 | 
				
			||||||
      ("python-wrapper" ,python-wrapper)
 | 
					      ("python-wrapper" ,python-wrapper)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1254,6 +1254,7 @@ from the module-init-tools project.")
 | 
				
			||||||
    (native-inputs
 | 
					    (native-inputs
 | 
				
			||||||
     `(("pkg-config" ,pkg-config)
 | 
					     `(("pkg-config" ,pkg-config)
 | 
				
			||||||
       ("gperf" ,gperf)
 | 
					       ("gperf" ,gperf)
 | 
				
			||||||
 | 
					       ("glib" ,glib "bin")                       ; glib-genmarshal, etc.
 | 
				
			||||||
       ("perl" ,perl)                             ; for the tests
 | 
					       ("perl" ,perl)                             ; for the tests
 | 
				
			||||||
       ("python" ,python-2)))                     ; ditto
 | 
					       ("python" ,python-2)))                     ; ditto
 | 
				
			||||||
    (inputs
 | 
					    (inputs
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -66,7 +66,8 @@
 | 
				
			||||||
                                               (package-inputs cairo)))))
 | 
					                                               (package-inputs cairo)))))
 | 
				
			||||||
             ("glib" ,glib)))
 | 
					             ("glib" ,glib)))
 | 
				
			||||||
   (native-inputs
 | 
					   (native-inputs
 | 
				
			||||||
      `(("pkg-config" ,pkg-config)))
 | 
					      `(("pkg-config" ,pkg-config)
 | 
				
			||||||
 | 
					        ("glib" ,glib "bin")))                    ; glib-mkenums, etc.
 | 
				
			||||||
   (arguments
 | 
					   (arguments
 | 
				
			||||||
    `(#:tests? #f ; no test data provided with the tarball
 | 
					    `(#:tests? #f ; no test data provided with the tarball
 | 
				
			||||||
      #:configure-flags
 | 
					      #:configure-flags
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Reference in a new issue