aboutsummaryrefslogtreecommitdiff
path: root/gnu/services
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim.cournoyer@gmail.com>2022-12-28 14:26:44 -0500
committerMaxim Cournoyer <maxim.cournoyer@gmail.com>2022-12-28 16:58:03 -0500
commit4ca649e978f08335fcabdcef693a7049082b5373 (patch)
tree7fe47ac2fa0796914c5f781ceaf8217edd04253f /gnu/services
parentbcd131dafbaf61ae823c0a3ba1b886f5b0c15ea9 (diff)
downloadguix-4ca649e978f08335fcabdcef693a7049082b5373.tar
guix-4ca649e978f08335fcabdcef693a7049082b5373.tar.gz
services: pulseaudio: Fix /etc/pulse/default.pa not being used.
Fixes <https://issues.guix.gnu.org/60383>. * 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 <mirai@makinata.eu>
Diffstat (limited to 'gnu/services')
-rw-r--r--gnu/services/sound.scm18
1 files 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