ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 21:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

services: jami-configuration: Rename 'jamid' field to 'libjami'.

Browse source 
* gnu/services/telephony.scm (gnu):
(jami-configuration)[jamid]: Rename field to...
[libjami]: ... this.
(jami-configuration->command-line-arguments): Adjust accordingly.
(jami-shepherd-services): Likewise.
This commit is contained in:
Maxim Cournoyer 2022-06-10 09:53:32 -04:00
parent 8994e13b9f
commit 8649ac5eaa
No known key found for this signature in database
GPG key ID: 1260E46482E63562
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/guix.texi
View file

@ -25543,7 +25543,7 @@ The complete set of available configuration options is detailed below.
Available @code{jami-configuration} fields are: Available @code{jami-configuration} fields are:
@table @asis @table @asis
@item @code{jamid} (default: @code{libjami}) (type: package) @item @code{libjami} (default: @code{libjami}) (type: package)
The Jami daemon package to use. The Jami daemon package to use.
@item @code{dbus} (default: @code{dbus-for-jami}) (type: package) @item @code{dbus} (default: @code{dbus-for-jami}) (type: package)

12
gnu/services/telephony.scm
View file

@ -49,7 +49,7 @@ (define-module (gnu services telephony)
jami-account-name-server-uri jami-account-name-server-uri
jami-configuration jami-configuration
jami-configuration-jamid jami-configuration-libjami
jami-configuration-dbus jami-configuration-dbus
jami-configuration-enable-logging? jami-configuration-enable-logging?
jami-configuration-debug? jami-configuration-debug?
@ -228,7 +228,7 @@ (define (jami-account-list? val)
(define-maybe/no-serialization jami-account-list) (define-maybe/no-serialization jami-account-list)
(define-configuration/no-serialization jami-configuration (define-configuration/no-serialization jami-configuration
(jamid (libjami
(file-like libjami) (file-like libjami)
"The Jami daemon package to use.") "The Jami daemon package to use.")
(dbus (dbus
@ -266,8 +266,8 @@ (define (jami-configuration->command-line-arguments config)
"Derive the command line arguments to used to launch the Jami daemon from "Derive the command line arguments to used to launch the Jami daemon from
CONFIG, a <jami-configuration> object." CONFIG, a <jami-configuration> object."
(match-record config <jami-configuration> (match-record config <jami-configuration>
(jamid dbus enable-logging? debug? auto-answer?) (libjami dbus enable-logging? debug? auto-answer?)
`(,(file-append jamid "/libexec/jamid") `(,(file-append libjami "/libexec/jamid")
"--persistent" ;stay alive after client quits "--persistent" ;stay alive after client quits
,@(if enable-logging? ,@(if enable-logging?
'() ;logs go to syslog by default '() ;logs go to syslog by default
@ -302,7 +302,7 @@ (define (jami-dbus-session-activation config)
(define (jami-shepherd-services config) (define (jami-shepherd-services config)
"Return a <shepherd-service> running the Jami daemon." "Return a <shepherd-service> running the Jami daemon."
(let* ((jamid (jami-configuration-jamid config)) (let* ((libjami (jami-configuration-libjami config))
(nss-certs (jami-configuration-nss-certs config)) (nss-certs (jami-configuration-nss-certs config))
(dbus (jami-configuration-dbus config)) (dbus (jami-configuration-dbus config))
(dbus-daemon (file-append dbus "/bin/dbus-daemon")) (dbus-daemon (file-append dbus "/bin/dbus-daemon"))
@ -524,7 +524,7 @@ (define disable-account-action
#:environment-variables #:environment-variables
;; This is so that the cx.ring.Ring service D-Bus ;; This is so that the cx.ring.Ring service D-Bus
;; definition is found by dbus-daemon. ;; definition is found by dbus-daemon.
(list (string-append "XDG_DATA_DIRS=" #$jamid "/share")))) (list (string-append "XDG_DATA_DIRS=" #$libjami "/share"))))
(stop #~(make-kill-destructor))) (stop #~(make-kill-destructor)))
(shepherd-service (shepherd-service