From patchwork Sun Dec 31 17:10:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: paul X-Patchwork-Id: 58269 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 6278227BBEA; Sun, 31 Dec 2023 17:11:19 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B55F727BBE9 for ; Sun, 31 Dec 2023 17:11:18 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rJzL5-0006GK-B9; Sun, 31 Dec 2023 12:11: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 1rJzL3-0006GA-3f for guix-patches@gnu.org; Sun, 31 Dec 2023 12:11:01 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rJzL2-00078j-R6 for guix-patches@gnu.org; Sun, 31 Dec 2023 12:11:00 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rJzL4-0003OM-2f for guix-patches@gnu.org; Sun, 31 Dec 2023 12:11:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68181] [PATCH v2] gnu: extempore: Add rtmidi@4 to package inputs. References: <20231231165240.18076-1-goodoldpaul@autistici.org> In-Reply-To: <20231231165240.18076-1-goodoldpaul@autistici.org> Resent-From: Giacomo Leidi Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 31 Dec 2023 17:11:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68181 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68181@debbugs.gnu.org Cc: Giacomo Leidi Received: via spool by 68181-submit@debbugs.gnu.org id=B68181.170404262612997 (code B ref 68181); Sun, 31 Dec 2023 17:11:02 +0000 Received: (at 68181) by debbugs.gnu.org; 31 Dec 2023 17:10:26 +0000 Received: from localhost ([127.0.0.1]:46994 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJzKT-0003NZ-J7 for submit@debbugs.gnu.org; Sun, 31 Dec 2023 12:10:25 -0500 Received: from confino.investici.org ([93.190.126.19]:38721) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJzKR-0003NN-5A for 68181@debbugs.gnu.org; Sun, 31 Dec 2023 12:10:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1704042620; bh=1EF26Dp1BG0YUPA3pxuNeJXjRduf/kM/JAN+5ThsmvA=; h=From:To:Cc:Subject:Date:From; b=OJrq3ELalhBpwG5q3QAGt+msDbRWU3HPqntbhD8bG4lUReXpiRNn3LhcuwHokl3Xw 9LwKzugHYBuxjyiwgMBmmXHuHxxizpRmRAEVEkg71VC5ELDRm6pVasw0gHVy6x3WC9 bdk6yR8/sqQwpdardXG7eZKL8s8oiucbqB3px6aA= Received: from mx1.investici.org (unknown [127.0.0.1]) by confino.investici.org (Postfix) with ESMTP id 4T35GN38Nqz10xD; Sun, 31 Dec 2023 17:10:20 +0000 (UTC) Received: from [93.190.126.19] (mx1.investici.org [93.190.126.19]) (Authenticated sender: goodoldpaul@autistici.org) by localhost (Postfix) with ESMTPSA id 4T35GN2PN7z10vN; Sun, 31 Dec 2023 17:10:20 +0000 (UTC) Date: Sun, 31 Dec 2023 18:10:02 +0100 Message-ID: <20231231171002.23693-1-goodoldpaul@autistici.org> X-Mailer: git-send-email 2.41.0 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: , Reply-to: Giacomo Leidi X-ACL-Warn: , Giacomo Leidi via Guix-patches X-Patchwork-Original-From: Giacomo Leidi via Guix-patches via From: paul Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Some extempore code (libs/contrib/rtmidi.xtm specifically) depend on rtmidi, this patch adds it to package inputs and hardcodes the soname path. * gnu/packages/music.scm (extempore)[inputs]: Add rtmidi-4.0; [arguments]: new phase. Change-Id: I16e055a68d48c813fb54dd55f686be102a0850af --- gnu/packages/music.scm | 7 +++++++ 1 file changed, 7 insertions(+) base-commit: b7466215cd05c2a1cd7c7a18c92af30376d21043 diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 77e952d383..ece2c71385 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1073,6 +1073,12 @@ (define-public extempore ("gl/glcore-directbind" "libGL.so" "mesa") ("gl/glcompat-directbind" "libGL.so" "mesa"))) #t)) + (add-after 'hardcode-external-lib-paths 'hardcode-contrib-lib-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "libs/contrib/rtmidi.xtm" + (("librtmidic.so") + (string-append (assoc-ref inputs "rtmidi") + "/lib/librtmidi.so"))))) (add-after 'unpack 'use-own-llvm (lambda* (#:key inputs #:allow-other-keys) (setenv "EXT_LLVM_DIR" (assoc-ref inputs "llvm")) @@ -1125,6 +1131,7 @@ (define-public extempore ("libffi" ,libffi) ("jack" ,jack-1) ("libsndfile" ,libsndfile) + ("rtmidi" ,rtmidi-4.0) ("glfw" ,glfw) ("apr" ,apr) ("stb-image"