TakeV
/
guix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

* 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:
@table @asis
@item @code{jamid} (default: @code{libjami}) (type: package)
@item @code{libjami} (default: @code{libjami}) (type: package)
The Jami daemon package to use.
@item @code{dbus} (default: @code{dbus-for-jami}) (type: package)

12
gnu/services/telephony.scm
View File

@ -49,7 +49,7 @@
jami-account-name-server-uri
jami-configuration
jami-configuration-jamid
jami-configuration-libjami
jami-configuration-dbus
jami-configuration-enable-logging?
jami-configuration-debug?
@ -228,7 +228,7 @@ SET-ACCOUNT-DETAILS."
(define-maybe/no-serialization jami-account-list)
(define-configuration/no-serialization jami-configuration
(jamid
(libjami
(file-like libjami)
"The Jami daemon package to use.")
(dbus
@ -266,8 +266,8 @@ consistent state."))
"Derive the command line arguments to used to launch the Jami daemon from
CONFIG, a <jami-configuration> object."
(match-record config <jami-configuration>
(jamid dbus enable-logging? debug? auto-answer?)
`(,(file-append jamid "/libexec/jamid")
(libjami dbus enable-logging? debug? auto-answer?)
`(,(file-append libjami "/libexec/jamid")
"--persistent" ;stay alive after client quits
,@(if enable-logging?
'() ;logs go to syslog by default
@ -302,7 +302,7 @@ CONFIG, a <jami-configuration> object."
(define (jami-shepherd-services config)
"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))
(dbus (jami-configuration-dbus config))
(dbus-daemon (file-append dbus "/bin/dbus-daemon"))
@ -524,7 +524,7 @@ argument, either a registered username or the fingerprint of the account.")
#:environment-variables
;; This is so that the cx.ring.Ring service D-Bus
;; 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)))
(shepherd-service