Received: (at 68181) by debbugs.gnu.org; 31 Dec 2023 17:10:26 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Dec 31 12:10:25 2023
Received: from localhost ([127.0.0.1]:46994 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rJzKT-0003NZ-J7
for submit <at> 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 <goodoldpaul@HIDDEN>) id 1rJzKR-0003NN-5A
for 68181 <at> 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@HIDDEN) by localhost (Postfix) with
ESMTPSA id 4T35GN2PN7z10vN; Sun, 31 Dec 2023 17:10:20 +0000 (UTC)
From: Giacomo Leidi <goodoldpaul@HIDDEN>
To: 68181 <at> debbugs.gnu.org
Subject: [PATCH v2] gnu: extempore: Add rtmidi@4 to package inputs.
Date: Sun, 31 Dec 2023 18:10:02 +0100
Message-ID: <20231231171002.23693-1-goodoldpaul@HIDDEN>
X-Mailer: git-send-email 2.41.0
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 68181
Cc: Giacomo Leidi <goodoldpaul@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
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]<hardcode-contrib-lib-paths>: new phase.
Change-Id: I16e055a68d48c813fb54dd55f686be102a0850af
---
gnu/packages/music.scm | 7 +++++++
1 file changed, 7 insertions(+)
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"
base-commit: b7466215cd05c2a1cd7c7a18c92af30376d21043
--
2.41.0
guix-patches@HIDDEN:bug#68181; Package guix-patches.
Full text available.
Received: (at submit) by debbugs.gnu.org; 31 Dec 2023 16:53:21 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Dec 31 11:53:21 2023
Received: from localhost ([127.0.0.1]:46952 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rJz3x-0000Jf-9s
for submit <at> debbugs.gnu.org; Sun, 31 Dec 2023 11:53:21 -0500
Received: from lists.gnu.org ([2001:470:142::17]:41504)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <goodoldpaul@HIDDEN>) id 1rJz3v-0000JR-Dm
for submit <at> debbugs.gnu.org; Sun, 31 Dec 2023 11:53:19 -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 <goodoldpaul@HIDDEN>)
id 1rJz3o-0008TH-Ib
for guix-patches@HIDDEN; Sun, 31 Dec 2023 11:53:12 -0500
Received: from confino.investici.org ([93.190.126.19])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <goodoldpaul@HIDDEN>)
id 1rJz3m-0004Cm-NK
for guix-patches@HIDDEN; Sun, 31 Dec 2023 11:53:12 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org;
s=stigmate; t=1704041585;
bh=1wKJwiUB0sH2LbGPQKhoIPIWo9dtvG5pJ66E5CWn2hg=;
h=From:To:Cc:Subject:Date:From;
b=BLSKl97s2GeaaS1QyAP/NOBCCs8TbAlBpDzxh5LgUPLEBVQTboBLJ1h4jnQaUI+sW
VEdAcUyKKqdL7I3OwZ1TZ2JTNaCCPUWg/nUGiMb6LzkLeXfz3dsCdWUagBD9D6wiYG
1oRcaDoBBQRJ0HvNnNuAYa3B0/IFK6RmqMD+++sk=
Received: from mx1.investici.org (unknown [127.0.0.1])
by confino.investici.org (Postfix) with ESMTP id 4T34tT1jHHz10yG;
Sun, 31 Dec 2023 16:53:05 +0000 (UTC)
Received: from [93.190.126.19] (mx1.investici.org [93.190.126.19])
(Authenticated sender: goodoldpaul@HIDDEN) by localhost (Postfix) with
ESMTPSA id 4T34tT0vlsz10wk; Sun, 31 Dec 2023 16:53:05 +0000 (UTC)
From: Giacomo Leidi <goodoldpaul@HIDDEN>
To: guix-patches@HIDDEN
Subject: [PATCH] gnu: extempore: Add rtmidi@4 to package inputs.
Date: Sun, 31 Dec 2023 17:52:40 +0100
Message-ID: <20231231165240.18076-1-goodoldpaul@HIDDEN>
X-Mailer: git-send-email 2.41.0
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=93.190.126.19;
envelope-from=goodoldpaul@HIDDEN; helo=confino.investici.org
X-Spam_score_int: -27
X-Spam_score: -2.8
X-Spam_bar: --
X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001,
T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 0.9 (/)
X-Debbugs-Envelope-To: submit
Cc: Giacomo Leidi <goodoldpaul@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.1 (/)
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]<hardcode-contrib-lib-paths>: new phase.
Change-Id: I16e055a68d48c813fb54dd55f686be102a0850af
---
gnu/packages/music.scm | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 77e952d383..a79fb3e4ee 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -1073,6 +1073,16 @@ (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)
+ (use-modules (ice-9 match))
+ (for-each
+ (match-lambda
+ ((file-name lib pkg-name)
+ (substitute* (string-append "libs/contrib/" file-name ".xtm")
+ ((lib) (string-append (assoc-ref inputs pkg-name)
+ "/lib/" lib)))))
+ '(("rtmidi" "librtmidi.so" "rtmidi")))))
(add-after 'unpack 'use-own-llvm
(lambda* (#:key inputs #:allow-other-keys)
(setenv "EXT_LLVM_DIR" (assoc-ref inputs "llvm"))
@@ -1125,6 +1135,7 @@ (define-public extempore
("libffi" ,libffi)
("jack" ,jack-1)
("libsndfile" ,libsndfile)
+ ("rtmidi" ,rtmidi-4.0)
("glfw" ,glfw)
("apr" ,apr)
("stb-image"
base-commit: b7466215cd05c2a1cd7c7a18c92af30376d21043
--
2.41.0
Giacomo Leidi <goodoldpaul@HIDDEN>:guix-patches@HIDDEN.
Full text available.guix-patches@HIDDEN:bug#68181; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.