aboutsummaryrefslogtreecommitdiff
path: root/gnu/services
diff options
context:
space:
mode:
Diffstat (limited to 'gnu/services')
-rw-r--r--gnu/services/desktop.scm3
-rw-r--r--gnu/services/games.scm2
-rw-r--r--gnu/services/messaging.scm13
3 files changed, 13 insertions, 5 deletions
diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm
index 517d5d3efe..0dada82738 100644
--- a/gnu/services/desktop.scm
+++ b/gnu/services/desktop.scm
@@ -29,6 +29,7 @@
#:use-module (gnu services avahi)
#:use-module (gnu services xorg)
#:use-module (gnu services networking)
+ #:use-module (gnu services sound)
#:use-module ((gnu system file-systems)
#:select (%elogind-file-systems))
#:use-module (gnu system shadow)
@@ -934,6 +935,8 @@ with the administrator's password."
x11-socket-directory-service
+ (service alsa-service-type)
+
%base-services))
;;; desktop.scm ends here
diff --git a/gnu/services/games.scm b/gnu/services/games.scm
index b146696237..b9d78e078d 100644
--- a/gnu/services/games.scm
+++ b/gnu/services/games.scm
@@ -27,7 +27,7 @@
#:use-module (guix records)
#:use-module (ice-9 match)
#:export (wesnothd-configuration
- wesnoth-configuration?
+ wesnothd-configuration?
wesnothd-service-type))
;;;
diff --git a/gnu/services/messaging.scm b/gnu/services/messaging.scm
index 273ba2cc14..4b7e724a78 100644
--- a/gnu/services/messaging.scm
+++ b/gnu/services/messaging.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2017, 2018 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2015, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2018 Pierre-Antoine Rouby <contact@parouby.fr>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -790,20 +791,24 @@ string, you could instantiate a prosody service like this:
(default "127.0.0.1"))
(port bitlbee-configuration-port
(default 6667))
+ (plugins bitlbee-plugins
+ (default '()))
(extra-settings bitlbee-configuration-extra-settings
(default "")))
(define bitlbee-shepherd-service
(match-lambda
- (($ <bitlbee-configuration> bitlbee interface port extra-settings)
- (let ((conf (plain-file "bitlbee.conf"
- (string-append "
+ (($ <bitlbee-configuration> bitlbee interface port
+ plugins extra-settings)
+ (let ((conf (mixed-text-file "bitlbee.conf"
+ "
[settings]
User = bitlbee
ConfigDir = /var/lib/bitlbee
DaemonInterface = " interface "
DaemonPort = " (number->string port) "
-" extra-settings))))
+ PluginDir = " (directory-union "bitlbee-plugins" plugins) "/lib/bitlbee
+" extra-settings)))
(with-imported-modules (source-module-closure
'((gnu build shepherd)