From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
To: 60383@debbugs.gnu.org
Cc: mirai@makinata.eu, Maxim Cournoyer <maxim.cournoyer@gmail.com>
Subject: bug#60383: [PATCH] services: pulseaudio: Fix /etc/pulse/default.pa not being used.
Date: Wed, 28 Dec 2022 14:38:28 -0500 [thread overview]
Message-ID: <20221228193828.25024-1-maxim.cournoyer@gmail.com> (raw)
In-Reply-To: <892773bb-039b-c28f-a54b-35f70ebac471@makinata.eu>
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>
---
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 @@ (define pulseaudio-etc
'()
`(("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
base-commit: bbada5967d791776c7f6a81e272a0e6a67d216bb
--
2.38.1
next prev parent reply other threads:[~2022-12-28 19:39 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-28 17:13 bug#60383: Pulseaudio does not source 'extra-script'files' from pulseaudio-configuration mirai
2022-12-28 19:38 ` Maxim Cournoyer [this message]
2022-12-28 21:59 ` bug#60383: [PATCH] services: pulseaudio: Fix /etc/pulse/default.pa not being used Maxim Cournoyer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221228193828.25024-1-maxim.cournoyer@gmail.com \
--to=maxim.cournoyer@gmail.com \
--cc=60383@debbugs.gnu.org \
--cc=mirai@makinata.eu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).