diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-03-09 15:31:23 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-03-09 15:31:23 +0100 |
| commit | f5a9103991531d17bd1d5a944dcec1c49fb9f395 (patch) | |
| tree | 3d8e311b01896ea9b709322fdf0e0dc3d7e09f44 /gnu | |
| parent | 255f730879ec6b3b655a54b44374a3b0a905145c (diff) | |
| download | patches-f5a9103991531d17bd1d5a944dcec1c49fb9f395.tar patches-f5a9103991531d17bd1d5a944dcec1c49fb9f395.tar.gz | |
gnu: dbus: Incorporate "dbus-helper-search-path.patch".
* gnu/packages/glib.scm (dbus)[source]: Apply
"dbus-helper-search-path.patch".
(dbus/activation): Remove.
* gnu/services/dbus.scm (<dbus-configuration>)[dbus]: Default to DBUS.
(dbus-service): Likewise.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/glib.scm | 16 | ||||
| -rw-r--r-- | gnu/services/dbus.scm | 8 |
2 files changed, 7 insertions, 17 deletions
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index bc69af5a9e..16a1a6162d 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -61,14 +61,15 @@ (name "dbus") (version "1.10.0") (source (origin - ;; TODO: Apply patch from DBUS/ACTIVATION below. (method url-fetch) (uri (string-append "https://dbus.freedesktop.org/releases/dbus/dbus-" version ".tar.gz")) (sha256 (base32 - "0jwj7wlrhq5y0fwfh8k2d9rgdpfax06lj8698g6iqbwrzd2rgyqx")))) + "0jwj7wlrhq5y0fwfh8k2d9rgdpfax06lj8698g6iqbwrzd2rgyqx")) + (patches + (list (search-patch "dbus-helper-search-path.patch"))))) (build-system gnu-build-system) (arguments '(#:configure-flags @@ -126,17 +127,6 @@ or through unencrypted TCP/IP suitable for use behind a firewall with shared NFS home directories.") (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 (package (name "glib") diff --git a/gnu/services/dbus.scm b/gnu/services/dbus.scm index 88a840a4b5..9a4a13d41d 100644 --- a/gnu/services/dbus.scm +++ b/gnu/services/dbus.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com> ;;; ;;; This file is part of GNU Guix. @@ -21,7 +21,7 @@ #:use-module (gnu services) #:use-module (gnu services shepherd) #: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 (guix gexp) #:use-module (guix records) @@ -38,7 +38,7 @@ dbus-configuration make-dbus-configuration dbus-configuration? (dbus dbus-configuration-dbus ;<package> - (default dbus/activation)) + (default dbus)) (services dbus-configuration-services ;list of <package> (default '()))) @@ -198,7 +198,7 @@ includes the @code{etc/dbus-1/system.d} directories of each package listed in (append (dbus-configuration-services config) 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 support for @var{services}. |