me
/
guix
Archived
1
0
Fork 0
Code

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>
master
Maxim Cournoyer 2022-12-28 14:26:44 -05:00
parent bcd131dafb
commit 4ca649e978
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gnu/services/sound.scm
View File

@ -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