From 4ca649e978f08335fcabdcef693a7049082b5373 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 28 Dec 2022 14:26:44 -0500 Subject: services: pulseaudio: Fix /etc/pulse/default.pa not being used. Fixes . * gnu/services/sound.scm (pulseaudio-etc): Produce daemon.conf unconditionally, with the correct default-script-file location. Produce client.conf unconditionally. Reported-by: Bruno Victal --- gnu/services/sound.scm | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/gnu/services/sound.scm b/gnu/services/sound.scm index 8410ba2418..3e778f3cea 100644 --- a/gnu/services/sound.scm +++ b/gnu/services/sound.scm @@ -204,17 +204,13 @@ computed-file object~%") file)))) '() `(("default.pa.d" ,(extra-script-files->file-union extra-script-files)))) - ,@(if (null? daemon-conf) - '() - `(("daemon.conf" - ,(apply mixed-text-file "daemon.conf" - "default-script-file = " default-script-file "\n" - (map pulseaudio-conf-entry daemon-conf))))) - ,@(if (null? client-conf) - '() - `(("client.conf" - ,(apply mixed-text-file "client.conf" - (map pulseaudio-conf-entry client-conf)))))))))))) + ("daemon.conf" + ,(apply mixed-text-file "daemon.conf" + "default-script-file = /etc/pulse/default.pa\n" + (map pulseaudio-conf-entry daemon-conf))) + ("client.conf" + ,(apply mixed-text-file "client.conf" + (map pulseaudio-conf-entry client-conf)))))))))) (define pulseaudio-service-type (service-type -- cgit v1.2.3