* [bug#68181] [PATCH] gnu: extempore: Add rtmidi@4 to package inputs.
@ 2023-12-31 16:52 Giacomo Leidi via Guix-patches via
2023-12-31 17:10 ` [bug#68181] [PATCH v2] " Giacomo Leidi via Guix-patches via
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Giacomo Leidi via Guix-patches via @ 2023-12-31 16:52 UTC (permalink / raw)
To: 68181; +Cc: Giacomo Leidi
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
^ permalink raw reply related [flat|nested] 4+ messages in thread* [bug#68181] [PATCH v2] gnu: extempore: Add rtmidi@4 to package inputs.
2023-12-31 16:52 [bug#68181] [PATCH] gnu: extempore: Add rtmidi@4 to package inputs Giacomo Leidi via Guix-patches via
@ 2023-12-31 17:10 ` Giacomo Leidi via Guix-patches via
2024-10-20 22:52 ` [bug#68181] [PATCH] " paul via Guix-patches via
2024-10-20 22:52 ` [bug#68181] [PATCH v2] " Giacomo Leidi via Guix-patches via
2 siblings, 0 replies; 4+ messages in thread
From: Giacomo Leidi via Guix-patches via @ 2023-12-31 17:10 UTC (permalink / raw)
To: 68181; +Cc: Giacomo Leidi
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
^ permalink raw reply related [flat|nested] 4+ messages in thread* [bug#68181] [PATCH] gnu: extempore: Add rtmidi@4 to package inputs.
2023-12-31 16:52 [bug#68181] [PATCH] gnu: extempore: Add rtmidi@4 to package inputs Giacomo Leidi via Guix-patches via
2023-12-31 17:10 ` [bug#68181] [PATCH v2] " Giacomo Leidi via Guix-patches via
@ 2024-10-20 22:52 ` paul via Guix-patches via
2024-10-20 22:52 ` [bug#68181] [PATCH v2] " Giacomo Leidi via Guix-patches via
2 siblings, 0 replies; 4+ messages in thread
From: paul via Guix-patches via @ 2024-10-20 22:52 UTC (permalink / raw)
To: 68181
Hi Guix , this is a friendly ping. I'm sending a patchset rebased on
current master.
Thank you for your work,
giacomo
^ permalink raw reply [flat|nested] 4+ messages in thread
* [bug#68181] [PATCH v2] gnu: extempore: Add rtmidi@4 to package inputs.
2023-12-31 16:52 [bug#68181] [PATCH] gnu: extempore: Add rtmidi@4 to package inputs Giacomo Leidi via Guix-patches via
2023-12-31 17:10 ` [bug#68181] [PATCH v2] " Giacomo Leidi via Guix-patches via
2024-10-20 22:52 ` [bug#68181] [PATCH] " paul via Guix-patches via
@ 2024-10-20 22:52 ` Giacomo Leidi via Guix-patches via
2 siblings, 0 replies; 4+ messages in thread
From: Giacomo Leidi via Guix-patches via @ 2024-10-20 22:52 UTC (permalink / raw)
To: 68181; +Cc: Giacomo Leidi
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 9c1a617ca1..102f3143f4 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -1212,6 +1212,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"))
@@ -1264,6 +1270,7 @@ (define-public extempore
("libffi" ,libffi)
("jack" ,jack-1)
("libsndfile" ,libsndfile)
+ ("rtmidi" ,rtmidi-4.0)
("glfw" ,glfw)
("apr" ,apr)
("stb-image"
base-commit: 5ab3c4c1e43ebb637551223791db0ea3519986e1
--
2.46.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-10-20 22:52 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-12-31 16:52 [bug#68181] [PATCH] gnu: extempore: Add rtmidi@4 to package inputs Giacomo Leidi via Guix-patches via
2023-12-31 17:10 ` [bug#68181] [PATCH v2] " Giacomo Leidi via Guix-patches via
2024-10-20 22:52 ` [bug#68181] [PATCH] " paul via Guix-patches via
2024-10-20 22:52 ` [bug#68181] [PATCH v2] " Giacomo Leidi via Guix-patches via
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).