From patchwork Sat Sep 26 09:51:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Prafulla Giri X-Patchwork-Id: 24310 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id BE75927BBE9; Sat, 26 Sep 2020 10:53:08 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,HTML_MESSAGE,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 564F227BBE8 for ; Sat, 26 Sep 2020 10:53:08 +0100 (BST) Received: from localhost ([::1]:51076 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kM6t9-00070O-BO for patchwork@mira.cbaines.net; Sat, 26 Sep 2020 05:53:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47530) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kM6t4-000705-60 for guix-patches@gnu.org; Sat, 26 Sep 2020 05:53:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34291) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kM6t3-0004Mb-J4 for guix-patches@gnu.org; Sat, 26 Sep 2020 05:53:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kM6t3-0004iY-Iq for guix-patches@gnu.org; Sat, 26 Sep 2020 05:53:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43628] Progress (?) References: In-Reply-To: Resent-From: Prafulla Giri Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Sep 2020 09:53:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43628 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 43628@debbugs.gnu.org Received: via spool by 43628-submit@debbugs.gnu.org id=B43628.160111392618066 (code B ref 43628); Sat, 26 Sep 2020 09:53:01 +0000 Received: (at 43628) by debbugs.gnu.org; 26 Sep 2020 09:52:06 +0000 Received: from localhost ([127.0.0.1]:45837 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kM6s9-0004hK-Pk for submit@debbugs.gnu.org; Sat, 26 Sep 2020 05:52:05 -0400 Received: from mail-pg1-f180.google.com ([209.85.215.180]:35317) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kM6s8-0004gk-9E for 43628@debbugs.gnu.org; Sat, 26 Sep 2020 05:52:04 -0400 Received: by mail-pg1-f180.google.com with SMTP id g29so4488383pgl.2 for <43628@debbugs.gnu.org>; Sat, 26 Sep 2020 02:52:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=dEfzU4G9MpcCK43NhMxFc+KdV2FkGMJu0LIZJEkdg1I=; b=VP9ymK0idD32rkpiAIR86Rh+rHMgjH8xLRB0Xge1hsSl/m11pv0gAeDwUJhMh6ZhO9 /jHnzGuQLw+QXF2quD2KAYmdazFsAnPb3Yhk9eaY1LNUDNqOcDgYnGcUXQOpvKGee8ac SQdhTL++nsi/6lsGwXy3Wzt70UqndXvCjKp/Pk466kMfhuUPCApIcEU3dQu0TSK37Sq0 4dPIIhIMUze+kICSWZxIH3BKBGk33yr4nfcXjTMdTH2z3w169Voe2mY16LMiTLkmYX9k C/fDa1qCKFq0XQxSzYJIOUfOX86X7Cw6pBJWA6pNyiF7jVl81vEvrDF3JcQLwoP/SKDA ySNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=dEfzU4G9MpcCK43NhMxFc+KdV2FkGMJu0LIZJEkdg1I=; b=LbshDGN8inIDlldJQRf6e/yf9PR6ynvIR92kgd3QwlfxBu0NNSKw1uoVnJLKfD+3aq OPNbxTmAQcYuhqv3vfgp71xXrw7PYFoVT1KplQXnkkPsAn+rr3jimEjYUDWNgK6x/skE f2qtEWNSiE/m93AGQIcLfjTudj6iD24brGQcLyj04O5ilpCv1Ydpmp9lDVL1EhVo5qPF C4NO/vpvrjneycqvelV456laUPuzhDHIOrm/pgcRymX+QPJLdlKV5wGkcv96UbGFLwoK rinfh072RX15jdGxE+McGH/S53mPr3QbqhkQ011gKf84WkmHiHLOBVR1cMtsb5MmSPYB Ct4w== X-Gm-Message-State: AOAM533u6ojE7pY+eVt52w7d9rM+ETMVUoQCSODj70XtKp7RF3HJwIsk rjyEi2t8/PzIOHCz6UTfb57L4o5+fUFoU7fcieOafA+sNOY= X-Google-Smtp-Source: ABdhPJzCAX2nygo0j/TCvl2JpAGsn0gSqqiLJn2mTV7yzzHARrAk7LdqRY1sQ0XFgePA5TCkn8JjlZuD1AUbYfskPkc= X-Received: by 2002:aa7:9f0a:0:b029:13e:d13d:a107 with SMTP id g10-20020aa79f0a0000b029013ed13da107mr2441930pfr.35.1601113917855; Sat, 26 Sep 2020 02:51:57 -0700 (PDT) MIME-Version: 1.0 From: Prafulla Giri Date: Sat, 26 Sep 2020 15:36:46 +0545 Message-ID: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches So, there were a few issues with my union. I've fixed them. Attached is the diff as it stands right now. 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)