From 6afd1fd6bccf3093c6e7b29ed816ee0d5a10c537 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 16 Mar 2023 17:23:51 +0100 Subject: home: services: kodi: Remove host-side use of (shepherd support). This is a followup to 70056b1b2beebbc9f8ea2c34eacc57f379368ab3, which inadvertently pulled in (shepherd support) on the host side. * gnu/home/services/media.scm (home-kodi-services): Change 'command' and 'logfile' to gexps. Add 'modules' field to 'shepherd-service'. --- gnu/home/services/media.scm | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/gnu/home/services/media.scm b/gnu/home/services/media.scm index 48d7ccf67a..25e83ea4b9 100644 --- a/gnu/home/services/media.scm +++ b/gnu/home/services/media.scm @@ -18,11 +18,7 @@ (define-module (gnu home services media) #:use-module (srfi srfi-26) - #:use-module (ice-9 match) - - #:use-module (shepherd support) - #:use-module (gnu home services) #:use-module (gnu home services shepherd) #:use-module (gnu packages kodi) @@ -30,13 +26,14 @@ (define-module (gnu home services media) #:use-module (gnu services shepherd) #:use-module (guix records) #:use-module (guix gexp) - #:export (home-kodi-configuration home-kodi-service-type)) + ;;; ;;; Kodi. ;;; + (define-record-type* home-kodi-configuration make-home-kodi-configuration home-kodi-configuration? @@ -50,14 +47,13 @@ (define (home-kodi-services config) (match config (($ kodi extra-options) (let* ((kodi (file-append kodi "/bin/kodi")) - (command `(kodi - "-fs" - ,@extra-options)) - (log-file (string-append %user-log-dir "/kodi.log"))) + (command #~'(#$kodi "-fs" #$@extra-options)) + (log-file #~(string-append %user-log-dir "/kodi.log"))) (list (shepherd-service (documentation "Run the kodi media center.") (provision '(kodi)) - (start #~(make-forkexec-constructor '#$command + (modules '((shepherd support))) ;for '%user-log-dir' + (start #~(make-forkexec-constructor #$command #:log-file #$log-file)) (stop #~(make-kill-destructor)))))))) -- cgit v1.2.3