* [bug#54571] [PATCH] gnu: music21: Patch executables and add missing dependencies.
@ 2022-03-26 1:12 jgart via Guix-patches via
2022-03-26 9:33 ` Maxime Devos
2022-03-26 9:34 ` Maxime Devos
0 siblings, 2 replies; 3+ messages in thread
From: jgart via Guix-patches via @ 2022-03-26 1:12 UTC (permalink / raw)
To: 54571; +Cc: jgart
* gnu/packages/music.scm (music21)[arguments]: Patch executables.
[propagated-inputs]: Add python-matplotlib, python-jsonpickle, and
python-numpy.
[inputs]: Add lilypond, musescore, and xdg-utils.
---
gnu/packages/music.scm | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 9c8203aa80..2c6b530aac 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -1531,6 +1531,15 @@ (define-public music21
(arguments
`(#:phases
(modify-phases %standard-phases
+ (add-before 'build 'patch-executables
+ (lambda _
+ (substitute* '("music21/environment.py"
+ "music21/lily/translate.py")
+ (("/usr/bin/lilypond") (which "lilypond"))
+ (("/usr/bin/mscore3") (which "mscore"))
+ (("/usr/bin/xdg-open") (which "xdg-open"))
+ (("LILYEXEC = 'lilypond'")
+ (string-append "LILYEXEC = '" (which "lilypond") "'")))))
(replace 'check
(lambda* (#:key tests? inputs outputs #:allow-other-keys)
(when tests?
@@ -1538,8 +1547,17 @@ (define-public music21
;; See: https://github.com/cuthbertLab/music21/issues/1164
(invoke "python" "-m" "music21.stream.tests")))))))
(propagated-inputs
- (list python-chardet python-joblib python-more-itertools
- python-webcolors))
+ (list python-chardet
+ python-joblib
+ python-matplotlib
+ python-jsonpickle
+ python-more-itertools
+ python-webcolors
+ python-numpy))
+ (inputs
+ (list lilypond
+ musescore
+ xdg-utils))
(home-page "https://web.mit.edu/music21/")
(synopsis "Toolkit for Computational Musicology")
(description
--
2.34.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [bug#54571] [PATCH] gnu: music21: Patch executables and add missing dependencies.
2022-03-26 1:12 [bug#54571] [PATCH] gnu: music21: Patch executables and add missing dependencies jgart via Guix-patches via
@ 2022-03-26 9:33 ` Maxime Devos
2022-03-26 9:34 ` Maxime Devos
1 sibling, 0 replies; 3+ messages in thread
From: Maxime Devos @ 2022-03-26 9:33 UTC (permalink / raw)
To: jgart, 54571
[-- Attachment #1: Type: text/plain, Size: 734 bytes --]
jgart via Guix-patches via schreef op vr 25-03-2022 om 21:12 [-0400]:
> + (("/usr/bin/lilypond") (which "lilypond"))
> + (("/usr/bin/mscore3") (which "mscore"))
> + (("/usr/bin/xdg-open") (which "xdg-open"))
> + (("LILYEXEC = 'lilypond'")
> + (string-append "LILYEXEC = '" (which "lilypond") "'")))))
> [...]
> + (inputs
> + (list lilypond
> + musescore
> + xdg-utils))
'which' looks in native-inputs, not the 'inputs', so this is probably
incorrect when cross-compiling. I suggest using (search-input-file
inputs "/bin/lilypond") instead.
Greetings,
Maxime.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* [bug#54571] [PATCH] gnu: music21: Patch executables and add missing dependencies.
2022-03-26 1:12 [bug#54571] [PATCH] gnu: music21: Patch executables and add missing dependencies jgart via Guix-patches via
2022-03-26 9:33 ` Maxime Devos
@ 2022-03-26 9:34 ` Maxime Devos
1 sibling, 0 replies; 3+ messages in thread
From: Maxime Devos @ 2022-03-26 9:34 UTC (permalink / raw)
To: jgart, 54571
[-- Attachment #1: Type: text/plain, Size: 640 bytes --]
jgart via Guix-patches via schreef op vr 25-03-2022 om 21:12 [-0400]:
> (propagated-inputs
> - (list python-chardet python-joblib python-more-itertools
> - python-webcolors))
> + (list python-chardet
> + python-joblib
> + python-matplotlib
> + python-jsonpickle
> + python-more-itertools
> + python-webcolors
> + python-numpy))
It is a tool, and not (only?) a library, so do these need to be
propagated, or would some wrapping suffice?
Greetings,
Maxime.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-03-26 9:35 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-26 1:12 [bug#54571] [PATCH] gnu: music21: Patch executables and add missing dependencies jgart via Guix-patches via
2022-03-26 9:33 ` Maxime Devos
2022-03-26 9:34 ` Maxime Devos
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).