~ruther/guix-local

2e88d113aac31dbea0b998fca92b35dbfc998872 — Andreas Enge 10 years ago c71979f
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.
M gnu/packages/audio.scm => gnu/packages/audio.scm +0 -2
@@ 991,10 991,8 @@ buffers, and audio capture.")
       ("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)))

M gnu/packages/glib.scm => gnu/packages/glib.scm +3 -2
@@ 353,10 353,11 @@ translated.")
              (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)))

M gnu/packages/gnome.scm => gnu/packages/gnome.scm +1 -5
@@ 823,8 823,7 @@ use in GNOME applications, built on top of CORBA.")
              (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 @@ designed to be accessed through the MIME functions in GnomeVFS.")
         %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 @@ keyboard shortcuts.")
       ("intltool" ,intltool)))
    (inputs
     `(("eudev" ,eudev)
       ("dbus" ,dbus)
       ("dbus-glib" ,dbus-glib)
       ("libusb" ,libusb)
       ("lcms" ,lcms)


@@ 2069,7 2066,6 @@ faster results and to avoid unnecessary server load.")
       ("python" ,python)))
    (inputs
     `(("eudev" ,eudev)
       ("dbus" ,dbus)
       ("dbus-glib" ,dbus-glib)
       ("libusb" ,libusb)))
    (home-page "http://upower.freedesktop.org/")

M gnu/packages/gnuzilla.scm => gnu/packages/gnuzilla.scm +0 -2
@@ 245,9 245,7 @@ standards.")
     `(("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)

M gnu/packages/mail.scm => gnu/packages/mail.scm +1 -1
@@ 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 @@ MailCore 2.")
    (inputs `(("bogofilter" ,bogofilter)
              ("curl" ,curl)
              ("dbus-glib" ,dbus-glib)
              ("dbus" ,dbus)
              ("enchant" ,enchant)
              ("expat" ,expat)
              ("ghostscript" ,ghostscript)

M gnu/packages/messaging.scm => gnu/packages/messaging.scm +1 -0
@@ 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.
;;;

M gnu/packages/python.scm => gnu/packages/python.scm +1 -3
@@ 3274,9 3274,7 @@ features useful for text console applications.")
     `(("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.")

M gnu/packages/wicd.scm => gnu/packages/wicd.scm +2 -2
@@ 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 @@
                       "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)