From patchwork Thu Apr 22 09:54:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 28754 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 304D627BC7C; Thu, 22 Apr 2021 10:55:36 +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.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED 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 F012427BC7B for ; Thu, 22 Apr 2021 10:55:35 +0100 (BST) Received: from localhost ([::1]:43766 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lZW3b-0006IR-7K for patchwork@mira.cbaines.net; Thu, 22 Apr 2021 05:55:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45926) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lZW35-0006GO-Hc for guix-patches@gnu.org; Thu, 22 Apr 2021 05:55:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49482) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lZW34-00089Z-KO for guix-patches@gnu.org; Thu, 22 Apr 2021 05:55:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lZW34-000520-Jo for guix-patches@gnu.org; Thu, 22 Apr 2021 05:55:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47947] [PATCH 3/5] gnu: alsa-lib: Use alsa-ucm-conf and alsa-topology-conf. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 22 Apr 2021 09:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47947 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47947@debbugs.gnu.org Cc: Mathieu Othacehe Received: via spool by 47947-submit@debbugs.gnu.org id=B47947.161908527819274 (code B ref 47947); Thu, 22 Apr 2021 09:55:02 +0000 Received: (at 47947) by debbugs.gnu.org; 22 Apr 2021 09:54:38 +0000 Received: from localhost ([127.0.0.1]:32787 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lZW2g-00050m-52 for submit@debbugs.gnu.org; Thu, 22 Apr 2021 05:54:38 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33234) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lZW2c-000509-HO for 47947@debbugs.gnu.org; Thu, 22 Apr 2021 05:54:34 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:46534) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lZW2X-0007v7-5y for 47947@debbugs.gnu.org; Thu, 22 Apr 2021 05:54:29 -0400 Received: from [2a01:e0a:19b:d9a0:9576:8bbf:4795:82ee] (port=53380 helo=localhost.localdomain) by fencepost.gnu.org with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1lZW2W-0004Ex-42; Thu, 22 Apr 2021 05:54:28 -0400 From: Mathieu Othacehe Date: Thu, 22 Apr 2021 11:54:19 +0200 Message-Id: <20210422095421.10358-3-othacehe@gnu.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210422095421.10358-1-othacehe@gnu.org> References: <20210422095421.10358-1-othacehe@gnu.org> MIME-Version: 1.0 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 * gnu/packages/linux.scm (alsa)[arguments]: Add a pre-install phase that creates symlinks to alsa-ucm-conf and alsa-topology-conf files. --- gnu/packages/linux.scm | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b60e6ad392..e5fe79b4b6 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2198,7 +2198,31 @@ configuration files that can be used for specific audio hardware.") (arguments '(#:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath=" (assoc-ref %outputs "out") - "/lib")))) + "/lib")) + #:phases + (modify-phases %standard-phases + (add-before 'install 'pre-install + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((ucm + (string-append (assoc-ref inputs "alsa-ucm-conf"))) + (topology + (string-append (assoc-ref inputs "alsa-topology-conf"))) + (alsa + (string-append (assoc-ref outputs "out") "/share/alsa")) + (ucm-share + (string-append ucm "/share/alsa/ucm")) + (ucm2-share + (string-append ucm "/share/alsa/ucm2")) + (topology-share + (string-append topology "/share/alsa/topology"))) + (mkdir-p alsa) + (symlink ucm-share (string-append alsa "/ucm")) + (symlink ucm2-share (string-append alsa "/ucm2")) + (symlink topology-share (string-append alsa "/topology"))) + #t))))) + (inputs + `(("alsa-ucm-conf" ,alsa-ucm-conf) + ("alsa-topology-conf" ,alsa-topology-conf))) (home-page "https://www.alsa-project.org/") (synopsis "The Advanced Linux Sound Architecture libraries") (description