From 74ad534cc6b405ba53976effc14768c5f1024e6b Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Sat, 15 Jul 2023 00:51:13 +0800 Subject: [PATCH] services: clash: Use clash package. * rosenthal/services/child-error.scm (clash-configuration)[clash]: Change default value to clash-bin package. (clash-shepherd-service)[start]: Adjust accordingly. --- rosenthal/services/child-error.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/rosenthal/services/child-error.scm b/rosenthal/services/child-error.scm index ccf3436..be85cae 100644 --- a/rosenthal/services/child-error.scm +++ b/rosenthal/services/child-error.scm @@ -16,6 +16,7 @@ #:use-module (gnu services databases) #:use-module (gnu services shepherd) #:use-module (gnu system shadow) + #:use-module (rosenthal packages binaries) #:use-module (rosenthal packages networking) #:use-module (rosenthal utils home-services-utils) #:export (clash-configuration @@ -41,8 +42,8 @@ (define-configuration/no-serialization clash-configuration (clash - (string "/bin/clash") - "The clash executable.") + (file-like clash-bin) + "The clash package.") (log-file (string "/var/log/clash.log") "Where the logs go.") @@ -83,7 +84,8 @@ (provision '(clash)) (requirement '(loopback networking)) (start #~(make-forkexec-constructor - (list #$clash "-d" #$data-directory) + (list #$(file-append clash "/bin/clash") + "-d" #$data-directory) #:user "clash" #:group "clash" #:log-file #$log-file))