From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id KEfhGF+brGOJWAEAbAwnHQ (envelope-from ) for ; Wed, 28 Dec 2022 20:39:11 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id kK3bGF+brGPBCgEA9RJhRA (envelope-from ) for ; Wed, 28 Dec 2022 20:39:11 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 1373439B2C for ; Wed, 28 Dec 2022 20:39:10 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pAcGW-0003vc-6q; Wed, 28 Dec 2022 14:39:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pAcGU-0003vE-CX for bug-guix@gnu.org; Wed, 28 Dec 2022 14:39:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pAcGT-00082A-SY for bug-guix@gnu.org; Wed, 28 Dec 2022 14:39:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pAcGT-0003SZ-Nq for bug-guix@gnu.org; Wed, 28 Dec 2022 14:39:01 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#60383: [PATCH] services: pulseaudio: Fix /etc/pulse/default.pa not being used. References: <892773bb-039b-c28f-a54b-35f70ebac471@makinata.eu> In-Reply-To: <892773bb-039b-c28f-a54b-35f70ebac471@makinata.eu> Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Wed, 28 Dec 2022 19:39:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60383 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 60383@debbugs.gnu.org Cc: mirai@makinata.eu, Maxim Cournoyer Received: via spool by 60383-submit@debbugs.gnu.org id=B60383.167225632413272 (code B ref 60383); Wed, 28 Dec 2022 19:39:01 +0000 Received: (at 60383) by debbugs.gnu.org; 28 Dec 2022 19:38:44 +0000 Received: from localhost ([127.0.0.1]:58759 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pAcGB-0003S0-Vi for submit@debbugs.gnu.org; Wed, 28 Dec 2022 14:38:44 -0500 Received: from mail-qt1-f173.google.com ([209.85.160.173]:44821) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pAcG8-0003Rk-IH for 60383@debbugs.gnu.org; Wed, 28 Dec 2022 14:38:42 -0500 Received: by mail-qt1-f173.google.com with SMTP id c11so13413152qtn.11 for <60383@debbugs.gnu.org>; Wed, 28 Dec 2022 11:38:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=bGkLh7W+ODMj6jT5u5VAU7zLqOTCVt5uSFhAwqBrr3M=; b=EvwbNcyE5krq2C2WlxiAueOxno2BZt8ApTHi52sUOeL+Ah8JzDER/3SxzSKk0r9R4a dX9CVwkbOxp6Bp9xN86ZytOgVHSOoeZt6WV+nlVG/iBXNlPaMir+q8VLRPp3GM3nMrzl wSFwoMPXGWFhhHbe0xn/1BlCS/W6bgKcx4/zZvygJK//I7MPkJZLTlw9j709zkMHcKdB 0rx3nhKAL9/tnwI9VMjpx6YAd9rdZaWbNqs26pq3XhaCwNMBakAbfwyf3nSXyPNcrEgh OFgCucK5cHwWrN2/SvRZUOCox6MGNm2oSUxPA19VoKZrWIZIyzQ8hp/QEOPxAEEUPEwQ 5ozA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=bGkLh7W+ODMj6jT5u5VAU7zLqOTCVt5uSFhAwqBrr3M=; b=bHkqWDhRxTiR3W2syRKS4Tmt5tKtV4PdaOEOz0+/db9N/BV6h5J+q2xN79KS+/iMVb uDq//YOuTUmOgLefpYfq3AR3Q43w1MQ2OBvpmA/auGC4+5sKXH5zhqwS28w436DlPTyL tM7hYUKNJcNX5QuFNRR5gy6q260ztsmnzkPVgq0vw0Z2YEkuw1wZOn6OuESeGpEaIrNq 6+OgIe24EKKe13lyeuB55UV9hJaBoFD21dYxi8breFfj7k2fsCt37k6C2n2DY0TbofY6 E/eu1p/cRQSrz9P5l0CS32G6lpB2L0ykIwYzssFibyytr0Kf/0LZsEjpFX6D47ZeZ/to HGPA== X-Gm-Message-State: AFqh2kr4DAAo14zGFj5kf45x1cZR6QCCfsN5alQU8DpwteBxWY6TLvMl pcMmtGgSjcz1Jw5/GNYz/6vFdfem7ODdEw== X-Google-Smtp-Source: AMrXdXs5vekRClqgUcjrtvvwBi46rcgVDyGznPkbpfKbodNmUpJgIXO9tSaF94EucuOYtARSF1/8CA== X-Received: by 2002:ac8:748f:0:b0:3a5:2704:d4bd with SMTP id v15-20020ac8748f000000b003a52704d4bdmr37464099qtq.16.1672256314837; Wed, 28 Dec 2022 11:38:34 -0800 (PST) Received: from localhost.localdomain (dsl-153-10.b2b2c.ca. [66.158.153.10]) by smtp.gmail.com with ESMTPSA id n15-20020a05620a294f00b006eeb3165554sm12115627qkp.19.2022.12.28.11.38.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Dec 2022 11:38:34 -0800 (PST) From: Maxim Cournoyer Date: Wed, 28 Dec 2022 14:38:28 -0500 Message-Id: <20221228193828.25024-1-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: bug-guix-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1672256351; a=rsa-sha256; cv=none; b=Osz7dlE3lYC0dJkCuxAYc0AVEOV4PIXW74V9dHvfctA9cB7+vwmJWsBvAuVi5ZdmReI2rq mBaF7K/RpL5v50Hly1nZHxPqVP67IjSxlCesn8sBdYOOQRY2a/pFW+geA7SYuffJ5dsm2v LyXk/UN+KDNEjdPRxSbTxpYpcNNWoE3+OSsjxuBWurZbqGYPmtqeS/zwOi9gYir1SV09NE 9nc96fMK/D/K7uTgnic2itT+1t1WzwxSKrtL4ppOM7/NRc2/M7w0nOD4cIlei0FZKukfIp AeR9G86Dd5DZeWFFfahupLFZpgQJsZOMIJO5r/aQfDpH7kt4QIVeOj4kOJK8jA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=EvwbNcyE; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1672256351; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=bGkLh7W+ODMj6jT5u5VAU7zLqOTCVt5uSFhAwqBrr3M=; b=LhrNLDz5F4251CuweOCj01aPN9u427isgtqkYp6mEAdrA/DrBGylxyz+rWUNxzo0fMzMjg aUCKkBXilTIiCgvFibsUZ7NQvBhNiad7ZEN5VP0fpnGHUl8y3c8N7b/+wKZVLRxiFytUwu dfdjG8WanUT5Hxn4sh6lixPHS0Z0C+W/bk1M8SLp4qYuYJ1DaL5r51mtMt4NhTE+9uj8Sm Qud06PCSBWh4aa0ViVtv0Zcz+4W3ysSqIWPKI+fPB4McomtnR7OptDynL7Bb+Pfj7qOia7 KWvm7EI6Vmu/oPBxK8yBXP7B4tPfOlK2mPyeuqhaXlTWgEMHCc5wtmrBr059HA== X-Spam-Score: 0.07 X-Migadu-Queue-Id: 1373439B2C Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=EvwbNcyE; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) X-Migadu-Scanner: scn0.migadu.com X-Migadu-Spam-Score: 0.07 X-TUID: ytbWM76C44Ug 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 @@ (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