all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Prafulla Giri <pratheblackdiamond@gmail.com>
To: 43628@debbugs.gnu.org
Subject: [bug#43628] Progress (?)
Date: Sat, 26 Sep 2020 15:36:46 +0545	[thread overview]
Message-ID: <CAFw+=j190xYV93tWTMPPZst8qZ8sqfDexycZvgTn1G6X0tutjw@mail.gmail.com> (raw)
In-Reply-To: <CAFw+=j3HG_a7f8R1p7C6izu+gAyeQ=uJVkijded881cTQcSnag@mail.gmail.com>


[-- Attachment #1.1: Type: text/plain, Size: 105 bytes --]

So, there were a few issues with my union. I've fixed them. Attached is the
diff as it stands right now.

[-- Attachment #1.2: Type: text/html, Size: 145 bytes --]

[-- Attachment #2: aegisub_alsa_pulseaudio.diff --]
[-- Type: text/x-patch, Size: 2171 bytes --]

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 0f727a6e9e..9a6a768af2 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -3836,7 +3836,40 @@ programmers to access a standard API to open and decompress media files.")
        ("hunspell" ,hunspell)
        ("mesa" ,mesa)
        ("libass" ,libass)
-       ("alsa-lib" ,alsa-lib)
+       ("alsa-lib-with-pulseaudio-plugin"
+        ,(package
+           (inherit alsa-lib)
+           (name "alsa-lib-with-pulseaudio-plugin")
+           (source #f)
+           (build-system trivial-build-system)
+           (arguments
+            `(#:modules ((guix build union)
+                         (guix build utils))
+              #:builder
+              (begin
+                (use-modules (ice-9 match)
+                             (guix build union)
+                             (guix build utils))
+                (let ((out (assoc-ref %outputs "out"))
+                      (alsa-lib (assoc-ref %build-inputs "alsa-lib")))
+                  (match %build-inputs
+                    (((names . directories) ...)
+                     (union-build out
+                                  directories
+                                  ;; Instead of a symlink union, this is will be a
+                                  ;; copy union, because this won't "Just Work™"
+                                  ;; with mere symlinks. Some of the files that make
+                                  ;; up the union need to tweaked to work properly.
+                                  #:create-all-directories? #t
+                                  #:symlink copy-file)))
+                  ;; Fix alsa-lib pkg-config file to point to the /gnu/store of
+                  ;; this union, rather than that of alsa-lib itself.
+                  (substitute* (string-append out "/lib/pkgconfig/alsa.pc")
+                    ((alsa-lib) out))
+                  #t))))
+           (inputs
+            `(("alsa-lib" ,alsa-lib)
+              ("alsa-plugins:pulseaudio" ,alsa-plugins "pulseaudio")))))
        ("pulseaudio" ,pulseaudio)
        ("libx11" ,libx11)
        ("freetype" ,freetype)

  parent reply	other threads:[~2020-09-26  9:53 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-26  6:15 [bug#43628] Request for patch evaluation/review Prafulla Giri
2020-09-26  6:36 ` [bug#43628] Further Info Prafulla Giri
2020-09-26  7:31   ` Prafulla Giri
2020-09-26  9:43     ` Julien Lepiller
2020-09-26  9:57       ` Prafulla Giri
2020-09-26 12:07         ` Prafulla Giri
2020-09-26 14:35           ` Julien Lepiller
2020-09-26 20:46             ` Prafulla Giri
2020-09-26 21:15               ` Julien Lepiller
2020-09-27  5:56                 ` Prafulla Giri
2020-09-27 11:09                   ` Julien Lepiller
2020-09-28 14:43                     ` Prafulla Giri
2020-09-28 15:20                       ` Julien Lepiller
2020-09-26  9:51 ` Prafulla Giri [this message]
2020-09-28 17:02 ` [bug#43628] Request for patch evaluation/review Leo Famulari

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CAFw+=j190xYV93tWTMPPZst8qZ8sqfDexycZvgTn1G6X0tutjw@mail.gmail.com' \
    --to=pratheblackdiamond@gmail.com \
    --cc=43628@debbugs.gnu.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 external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.