home: services: kodi: Remove host-side use of (shepherd support).
This is a followup to 70056b1b2b, 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'.
			
			
This commit is contained in:
		
							parent
							
								
									be7e2bf7eb
								
							
						
					
					
						commit
						6afd1fd6bc
					
				
					 1 changed files with 6 additions and 10 deletions
				
			
		| 
						 | 
					@ -18,11 +18,7 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(define-module (gnu home services media)
 | 
					(define-module (gnu home services media)
 | 
				
			||||||
  #: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 kodi)
 | 
					  #:use-module (gnu packages kodi)
 | 
				
			||||||
| 
						 | 
					@ -30,13 +26,14 @@
 | 
				
			||||||
  #: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-kodi-configuration
 | 
					  #:export (home-kodi-configuration
 | 
				
			||||||
            home-kodi-service-type))
 | 
					            home-kodi-service-type))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
;;;
 | 
					;;;
 | 
				
			||||||
;;; Kodi.
 | 
					;;; Kodi.
 | 
				
			||||||
;;;
 | 
					;;;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(define-record-type* <home-kodi-configuration>
 | 
					(define-record-type* <home-kodi-configuration>
 | 
				
			||||||
  home-kodi-configuration make-home-kodi-configuration
 | 
					  home-kodi-configuration make-home-kodi-configuration
 | 
				
			||||||
  home-kodi-configuration?
 | 
					  home-kodi-configuration?
 | 
				
			||||||
| 
						 | 
					@ -50,14 +47,13 @@
 | 
				
			||||||
  (match config
 | 
					  (match config
 | 
				
			||||||
    (($ <home-kodi-configuration> kodi extra-options)
 | 
					    (($ <home-kodi-configuration> kodi extra-options)
 | 
				
			||||||
     (let* ((kodi (file-append kodi "/bin/kodi"))
 | 
					     (let* ((kodi (file-append kodi "/bin/kodi"))
 | 
				
			||||||
            (command `(kodi
 | 
					            (command #~'(#$kodi "-fs" #$@extra-options))
 | 
				
			||||||
                       "-fs"
 | 
					            (log-file #~(string-append %user-log-dir "/kodi.log")))
 | 
				
			||||||
                       ,@extra-options))
 | 
					 | 
				
			||||||
            (log-file (string-append %user-log-dir "/kodi.log")))
 | 
					 | 
				
			||||||
       (list (shepherd-service
 | 
					       (list (shepherd-service
 | 
				
			||||||
              (documentation "Run the kodi media center.")
 | 
					              (documentation "Run the kodi media center.")
 | 
				
			||||||
              (provision '(kodi))
 | 
					              (provision '(kodi))
 | 
				
			||||||
              (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))))))))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Reference in a new issue