gnu: dbus: Add dependency on libX11.

* gnu/packages/glib.scm: Use #:export instead of 'define-public'.
  (dbus): Add LIBX11 as an input.
This commit is contained in:
Ludovic Courtès 2013-09-16 19:00:47 +02:00
parent aae4ead814
commit 803704418c

View file

@ -35,9 +35,18 @@ (define-module (gnu packages glib)
#:use-module (gnu packages python)
#:use-module (gnu packages xml)
#:use-module (gnu packages bash)
#:use-module (gnu packages file))
#:use-module (gnu packages file)
#:use-module (gnu packages xorg)
(define-public dbus
;; Export variables up-front to allow circular dependency with the 'xorg'
;; module.
#:export (dbus
glib
dbus-glib
intltool
itstool))
(define dbus
(package
(name "dbus")
(version "1.6.4")
@ -64,7 +73,12 @@ (define-public dbus
`(("expat" ,expat)
("pkg-config" ,pkg-config)
("patch/localstatedir"
,(search-patch "dbus-localstatedir.patch"))))
,(search-patch "dbus-localstatedir.patch"))
;; Add a dependency on libx11 so that 'dbus-launch' has support for
;; '--autolaunch'.
("libx11" ,libx11)))
(home-page "http://dbus.freedesktop.org/")
(synopsis "Message bus for inter-process communication (IPC)")
(description
@ -85,7 +99,7 @@ (define-public dbus
shared NFS home directories.")
(license license:gpl2+))) ; or Academic Free License 2.1
(define-public glib
(define glib
(package
(name "glib")
(version "2.37.1")
@ -157,7 +171,7 @@ (define-public glib
(home-page "http://developer.gnome.org/glib/")
(license license:lgpl2.0+))) ; some files are under lgpl2.1+
(define-public intltool
(define intltool
(package
(name "intltool")
(version "0.50.2")
@ -198,7 +212,7 @@ (define-public intltool
oaf files. This merge step will happen at build resp. installation time.")
(license license:gpl2+)))
(define-public itstool
(define itstool
(package
(name "itstool")
(version "1.2.0")
@ -232,7 +246,7 @@ (define-public itstool
translated.")
(license license:gpl3+)))
(define-public dbus-glib
(define dbus-glib
(package
(name "dbus-glib")
(version "0.100.2")