gnu: dbus: Merge with dbus/activation.
* gnu/packages/glib.scm (dbus): Apply patch. (dbus/activation): Remove. * gnu/services/dbus.scm: Use 'dbus' instead of 'dbus/activation'.
This commit is contained in:
parent
3b698589d2
commit
2a8b3b4e22
|
@ -61,14 +61,15 @@ (define dbus
|
||||||
(name "dbus")
|
(name "dbus")
|
||||||
(version "1.10.0")
|
(version "1.10.0")
|
||||||
(source (origin
|
(source (origin
|
||||||
;; TODO: Apply patch from DBUS/ACTIVATION below.
|
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append
|
(uri (string-append
|
||||||
"https://dbus.freedesktop.org/releases/dbus/dbus-"
|
"https://dbus.freedesktop.org/releases/dbus/dbus-"
|
||||||
version ".tar.gz"))
|
version ".tar.gz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0jwj7wlrhq5y0fwfh8k2d9rgdpfax06lj8698g6iqbwrzd2rgyqx"))))
|
"0jwj7wlrhq5y0fwfh8k2d9rgdpfax06lj8698g6iqbwrzd2rgyqx"))
|
||||||
|
(patches
|
||||||
|
(list (search-patch "dbus-helper-search-path.patch")))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
'(#:configure-flags
|
'(#:configure-flags
|
||||||
|
@ -126,17 +127,6 @@ (define dbus
|
||||||
shared NFS home directories.")
|
shared NFS home directories.")
|
||||||
(license license:gpl2+))) ; or Academic Free License 2.1
|
(license license:gpl2+))) ; or Academic Free License 2.1
|
||||||
|
|
||||||
(define-public dbus/activation
|
|
||||||
;; D-Bus with a patch to fix service activation.
|
|
||||||
;; TODO: Merge with DBUS above.
|
|
||||||
(package
|
|
||||||
(inherit dbus)
|
|
||||||
(version (string-append (package-version dbus) ".a"))
|
|
||||||
(source (origin
|
|
||||||
(inherit (package-source dbus))
|
|
||||||
(patches
|
|
||||||
(list (search-patch "dbus-helper-search-path.patch")))))))
|
|
||||||
|
|
||||||
(define glib
|
(define glib
|
||||||
(package
|
(package
|
||||||
(name "glib")
|
(name "glib")
|
||||||
|
|
|
@ -21,7 +21,7 @@ (define-module (gnu services dbus)
|
||||||
#:use-module (gnu services)
|
#:use-module (gnu services)
|
||||||
#:use-module (gnu services shepherd)
|
#:use-module (gnu services shepherd)
|
||||||
#:use-module (gnu system shadow)
|
#:use-module (gnu system shadow)
|
||||||
#:use-module ((gnu packages glib) #:select (dbus/activation))
|
#:use-module ((gnu packages glib) #:select (dbus))
|
||||||
#:use-module (gnu packages admin)
|
#:use-module (gnu packages admin)
|
||||||
#:use-module (guix gexp)
|
#:use-module (guix gexp)
|
||||||
#:use-module (guix records)
|
#:use-module (guix records)
|
||||||
|
@ -38,7 +38,7 @@ (define-record-type* <dbus-configuration>
|
||||||
dbus-configuration make-dbus-configuration
|
dbus-configuration make-dbus-configuration
|
||||||
dbus-configuration?
|
dbus-configuration?
|
||||||
(dbus dbus-configuration-dbus ;<package>
|
(dbus dbus-configuration-dbus ;<package>
|
||||||
(default dbus/activation))
|
(default dbus))
|
||||||
(services dbus-configuration-services ;list of <package>
|
(services dbus-configuration-services ;list of <package>
|
||||||
(default '())))
|
(default '())))
|
||||||
|
|
||||||
|
@ -198,7 +198,7 @@ (define dbus-root-service-type
|
||||||
(append (dbus-configuration-services config)
|
(append (dbus-configuration-services config)
|
||||||
services)))))))
|
services)))))))
|
||||||
|
|
||||||
(define* (dbus-service #:key (dbus dbus/activation) (services '()))
|
(define* (dbus-service #:key (dbus dbus) (services '()))
|
||||||
"Return a service that runs the \"system bus\", using @var{dbus}, with
|
"Return a service that runs the \"system bus\", using @var{dbus}, with
|
||||||
support for @var{services}.
|
support for @var{services}.
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue