unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Homo via Guix-patches via <guix-patches@gnu.org>
To: 75002@debbugs.gnu.org
Cc: Homo <gay@disroot.org>
Subject: [bug#75002] [PATCH] gnu: pulseaudio: Split outputs.
Date: Sat, 21 Dec 2024 01:44:54 +0200	[thread overview]
Message-ID: <20241220234453.22542-2-gay@disroot.org> (raw)

* gnu/packages/pulseaudio.scm (pulseaudio)[outputs]: New field.
[arguments]: Add phase to split outputs.
* gnu/services/sound.scm (pulseaudio-service-type): Use daemon output.

Change-Id: Idb9f32b1ebb4d19d3f63ef56e0e1f08cb1424006
---
Should /etc/xdg/autostart/pulseaudio.desktop be removed?

 gnu/packages/pulseaudio.scm | 57 ++++++++++++++++++++++++++++++++++++-
 gnu/services/sound.scm      |  3 +-
 2 files changed, 58 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm
index dd0d3985c0..77b0330a54 100644
--- a/gnu/packages/pulseaudio.scm
+++ b/gnu/packages/pulseaudio.scm
@@ -190,6 +190,9 @@ (define-public pulseaudio
                         "pulseaudio-fix-mult-test.patch"
                         "pulseaudio-longer-test-timeout.patch"))))
     (build-system meson-build-system)
+    (outputs '("out"     ;library
+               "daemon"  ;pulseaudio and start-pulseaudio-x11
+               "utils")) ;utilities
     (arguments
      (list
       #:configure-flags
@@ -211,7 +214,59 @@ (define-public pulseaudio
               (setenv "HOME" (getcwd))
               ;; 'thread-test' needs more time on hydra and on slower
               ;; machines, so we set the default timeout to 120 seconds.
-              (setenv "CK_DEFAULT_TIMEOUT" "120"))))))
+              (setenv "CK_DEFAULT_TIMEOUT" "120")))
+          (add-after 'install 'split
+            (lambda _
+              (let* ((out       #$output)
+                     (daemon    #$output:daemon)
+                     (utils     #$output:utils)
+                     (autostart "etc/xdg/autostart")
+                     (bin       "bin")
+                     (bash      "/share/bash-completion/completions")
+                     (etc       "/etc/pulse")
+                     (man1      "/share/man/man1")
+                     (man5      "/share/man/man5")
+                     (xwayland  "/etc/xdg/Xwayland-session.d")
+                     (zsh       "/share/zsh/site-functions")
+                     (rename-recursively
+                       (lambda (prefix dir files)
+                         (mkdir-p (string-append prefix "/" dir))
+                         (for-each (lambda (file)
+                                     (rename-file
+                                       (string-append
+                                         out "/" dir "/" file)
+                                       (string-append
+                                         prefix "/" dir "/" file)))
+                                   files))))
+                (rename-recursively daemon autostart
+                  (list "pulseaudio.desktop"))
+                (rename-recursively daemon bin
+                  (list "pulseaudio" "start-pulseaudio-x11"))
+                (rename-recursively daemon bash
+                  (list "pulseaudio"))
+                (rename-recursively daemon etc
+                  (list "daemon.conf" "default.pa" "system.pa"))
+                (rename-recursively daemon man1
+                  (list "pulseaudio.1" "start-pulseaudio-x11.1"))
+                (rename-recursively daemon man5
+                  (list "default.pa.5" "pulse-daemon.conf.5"))
+                (rename-recursively daemon xwayland
+                  (list "00-pulseaudio-x11"))
+                (rename-recursively utils bin
+                  (list "pa-info" "pacat" "pacmd" "pactl" "pamon"
+                        "paplay" "parec" "parecord" "pasuspender"
+                        "qpaeq"))
+                (rename-recursively utils bash
+                  (list "pacat" "pacmd" "pactl" "padsp" "paplay"
+                        "parec" "parecord" "pasuspender"))
+                (rename-recursively utils man1
+                  (list "pacat.1" "pacmd.1" "pactl.1" "pamon.1"
+                        "paplay.1" "parec.1" "parecord.1"
+                        "pasuspender.1" "pax11publish.1"))
+                (rename-recursively utils man5
+                  (list "pulse-cli-syntax.5"))
+                (rename-recursively utils zsh
+                  (list "_pulseaudio"))))))))
     (inputs
      (list alsa-lib
            bluez
diff --git a/gnu/services/sound.scm b/gnu/services/sound.scm
index 8ca7acd737..d29bb4bbd0 100644
--- a/gnu/services/sound.scm
+++ b/gnu/services/sound.scm
@@ -231,7 +231,8 @@ (define pulseaudio-service-type
     (list (service-extension session-environment-service-type
                              pulseaudio-environment)
           (service-extension etc-service-type pulseaudio-etc)
-          (service-extension udev-service-type (const (list pulseaudio)))))
+          (service-extension udev-service-type
+            (const (list `(,pulseaudio "daemon"))))))
    (default-value (pulseaudio-configuration))
    (description "Configure PulseAudio sound support.")))
 
-- 
2.46.0





                 reply	other threads:[~2024-12-20 23:48 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20241220234453.22542-2-gay@disroot.org \
    --to=guix-patches@gnu.org \
    --cc=75002@debbugs.gnu.org \
    --cc=gay@disroot.org \
    /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).