ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-23 11:09:41 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

home: services: znc: Remove host-side use of (shepherd support).

Browse source 
This is a followup to 193f547ca3, which
inadvertently pulled in (shepherd support) on the host side.

* gnu/home/services/messaging.scm (home-znc-services): Change 'command' and
'log-file' to gexps.  Add 'modules' field to 'shepherd-service'.
This commit is contained in:
Ludovic Courtès 2023-03-16 17:29:03 +01:00
parent 6afd1fd6bc
commit c68648a8a5
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gnu/home/services/messaging.scm
View file

@ -18,11 +18,7 @@
(define-module (gnu home services messaging) (define-module (gnu home services messaging)
#:use-module (srfi srfi-26) #:use-module (srfi srfi-26)
#:use-module (ice-9 match) #:use-module (ice-9 match)
#:use-module (shepherd support)
#:use-module (gnu home services) #:use-module (gnu home services)
#:use-module (gnu home services shepherd) #:use-module (gnu home services shepherd)
#:use-module (gnu packages messaging) #:use-module (gnu packages messaging)
@ -30,7 +26,6 @@ (define-module (gnu home services messaging)
#:use-module (gnu services shepherd) #:use-module (gnu services shepherd)
#:use-module (guix records) #:use-module (guix records)
#:use-module (guix gexp) #:use-module (guix gexp)
#:export (home-znc-configuration #:export (home-znc-configuration
home-znc-service-type)) home-znc-service-type))
@ -50,14 +45,13 @@ (define (home-znc-services config)
(match config (match config
(($ <home-znc-configuration> znc extra-options) (($ <home-znc-configuration> znc extra-options)
(let* ((znc (file-append znc "/bin/znc")) (let* ((znc (file-append znc "/bin/znc"))
(command `(,znc (command #~'(#$znc "--foreground" #$@extra-options))
"--foreground" (log-file #~(string-append %user-log-dir "/znc.log")))
,@extra-options))
(log-file (string-append %user-log-dir "/znc.log")))
(list (shepherd-service (list (shepherd-service
(documentation "Run the znc IRC bouncer.") (documentation "Run the znc IRC bouncer.")
(provision '(znc)) (provision '(znc))
(start #~(make-forkexec-constructor '#$command (modules '((shepherd support))) ;for '%user-log-dir'
(start #~(make-forkexec-constructor #$command
#:log-file #$log-file)) #:log-file #$log-file))
(stop #~(make-kill-destructor)))))))) (stop #~(make-kill-destructor))))))))