guix/guix
3
5
Fork 0
mirror of git://git.savannah.gnu.org/guix.git synced 2023-12-14 03:33:07 +01:00
Code Issues Releases Wiki Activity

services: pulseaudio: Deploy the configuration files to /etc/pulse.

Browse source 
* gnu/services/sound.scm (pulseaudio-environment)
[PULSE_CONFIG, PULSE_CLIENTCONFIG]: Use fixed locations, and move logic to...
(pulseaudio-etc): ... this service extension.  Guard against producing empty
files.
This commit is contained in:
Maxim Cournoyer 2022-01-31 15:49:31 -05:00
parent 60cb647a28
commit e680c40861
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
gnu/services/sound.scm
View file

@ -144,11 +144,11 @@ ctl.!default {
(define pulseaudio-environment
(match-lambda
(($ <pulseaudio-configuration> client-conf daemon-conf default-script-file)
`(("PULSE_CONFIG" . ,(apply mixed-text-file "daemon.conf"
"default-script-file = " default-script-file "\n"
(map pulseaudio-conf-entry daemon-conf)))
("PULSE_CLIENTCONFIG" . ,(apply mixed-text-file "client.conf"
(map pulseaudio-conf-entry client-conf)))))))
;; These config files kept at a fixed location, so that the following
;; environment values are stable and do not require the user to reboot to
;; effect their PulseAudio configuration changes.
'(("PULSE_CONFIG" . "/etc/pulse/daemon.conf")
("PULSE_CLIENTCONFIG" . "/etc/pulse/client.conf")))))
(define (extra-script-files->file-union extra-script-files)
"Return a G-exp obtained by processing EXTRA-SCRIPT-FILES with FILE-UNION."
@ -190,8 +190,8 @@ computed-file object~%") file))))
(define pulseaudio-etc
(match-lambda
(($ <pulseaudio-configuration> _ _ default-script-file extra-script-files
system-script-file)
(($ <pulseaudio-configuration> client-conf daemon-conf default-script-file
extra-script-files system-script-file)
`(("pulse"
,(file-union
"pulse"
@ -203,7 +203,18 @@ computed-file object~%") file))))
,@(if (null? extra-script-files)
'()
`(("default.pa.d" ,(extra-script-files->file-union
extra-script-files)))))))))))
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))))))))))))
(define pulseaudio-service-type
(service-type