gnu: dbus-glib: Propagate inputs dbus and glib.

* gnu/packages/glib.scm (dbus-glib): Propagate inputs dbus and glib.
* gnu/packages/audio.scm (patchage),
  gnu/packages/gnuzilla.scm (icecat),
  gnu/packages/python.scm (python-dbus): Drop inputs dbus and glib.
* gnu/packages/gnome.scm (colord, gconf, gnome-vfs, upower),
  gnu/packages/mail.scm (claws-mail),
  gnu/packages/messaging.scm (hexchat),
  gnu/packages/wicd.scm (wicd): Drop input dbus.
This commit is contained in:
Andreas Enge 2015-05-23 16:43:18 +02:00
parent c71979f416
commit 2e88d113aa
8 changed files with 9 additions and 17 deletions

View file

@ -991,10 +991,8 @@ (define-public patchage
("boost" ,boost)
("jack" ,jack-1)
("ganv" ,ganv)
("glib" ,glib)
("glibmm" ,glibmm)
("gtkmm" ,gtkmm-2)
("dbus" ,dbus)
("dbus-glib" ,dbus-glib)))
(native-inputs
`(("pkg-config" ,pkg-config)))

View file

@ -353,10 +353,11 @@ (define dbus-glib
(base32
"1xi1v1msz75qs0s4lkyf1psrksdppa3hwkg0mznc6gpw5flg3hdz"))))
(build-system gnu-build-system)
(inputs
(propagated-inputs ; according to dbus-glib-1.pc
`(("dbus" ,dbus)
("expat" ,expat)
("glib" ,glib)))
(inputs
`(("expat" ,expat)))
(native-inputs
`(("glib" ,glib "bin")
("pkg-config" ,pkg-config)))

View file

@ -823,8 +823,7 @@ (define-public gconf
(sha256
(base32 "0k3q9nh53yhc9qxf1zaicz4sk8p3kzq4ndjdsgpaa2db0ccbj4hr"))))
(build-system gnu-build-system)
(inputs `(("dbus" ,dbus)
("dbus-glib" ,dbus-glib)
(inputs `(("dbus-glib" ,dbus-glib)
("libxml2" ,libxml2)))
(propagated-inputs `(("glib" ,glib) ; referred to in the .pc file
("orbit2" ,orbit2)))
@ -893,7 +892,6 @@ (define-public gnome-vfs
%standard-phases))))
(inputs `(("libxml2" ,libxml2)
("dbus-glib" ,dbus-glib)
("dbus" ,dbus)
("gconf" ,gconf)
("gnome-mime-data" ,gnome-mime-data)
("zlib" ,zlib)))
@ -1935,7 +1933,6 @@ (define-public colord
("intltool" ,intltool)))
(inputs
`(("eudev" ,eudev)
("dbus" ,dbus)
("dbus-glib" ,dbus-glib)
("libusb" ,libusb)
("lcms" ,lcms)
@ -2069,7 +2066,6 @@ (define-public upower
("python" ,python)))
(inputs
`(("eudev" ,eudev)
("dbus" ,dbus)
("dbus-glib" ,dbus-glib)
("libusb" ,libusb)))
(home-page "http://upower.freedesktop.org/")

View file

@ -245,9 +245,7 @@ (define-public icecat
`(("alsa-lib" ,alsa-lib)
("bzip2" ,bzip2)
("cairo" ,cairo)
("dbus" ,dbus)
("dbus-glib" ,dbus-glib)
("glib" ,glib)
("gstreamer" ,gstreamer)
("gst-plugins-base" ,gst-plugins-base)
("gtk+" ,gtk+-2)

View file

@ -7,6 +7,7 @@
;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
;;;
;;; This file is part of GNU Guix.
;;;
@ -493,7 +494,6 @@ (define-public claws-mail
(inputs `(("bogofilter" ,bogofilter)
("curl" ,curl)
("dbus-glib" ,dbus-glib)
("dbus" ,dbus)
("enchant" ,enchant)
("expat" ,expat)
("ghostscript" ,ghostscript)

View file

@ -2,6 +2,7 @@
;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
;;;
;;; This file is part of GNU Guix.
;;;

View file

@ -3274,9 +3274,7 @@ (define-public python-dbus
`(("pkg-config" ,pkg-config)))
(inputs
`(("python" ,python)
("dbus" ,dbus)
("dbus-glib" ,dbus-glib)
("glib" ,glib)))
("dbus-glib" ,dbus-glib)))
(synopsis "Python bindings for D-bus")
(description "python-dbus provides bindings for libdbus, the reference
implementation of D-Bus.")

View file

@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 Pierre-Antoine Rault <par@rigelk.eu>
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
;;;
;;; This file is part of GNU Guix.
;;;
@ -49,8 +50,7 @@ (define-public wicd
"wicd-template-instantiation.patch")))))
(build-system python-build-system)
(native-inputs `(("gettext" ,gnu-gettext)))
(inputs `(("dbus" ,dbus)
("dbus-glib" ,dbus-glib)
(inputs `(("dbus-glib" ,dbus-glib)
("python2-dbus" ,python2-dbus)
("python2-pygtk" ,python2-pygtk)
("python2-urwid" ,python2-urwid)