diff options
| -rw-r--r-- | gnu/packages/cpp.scm | 14 | ||||
| -rw-r--r-- | gnu/packages/music.scm | 17 |
2 files changed, 12 insertions, 19 deletions
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 13ab6bbe62..a1b1e8dd4e 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -3209,20 +3209,6 @@ validation.") (home-page "https://github.com/simdjson/simdjson") (license license:asl2.0))) -(define-public simdjson-0.6 - (package - (inherit simdjson) - (version "0.6.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/simdjson/simdjson") - (commit (string-append "v" version)))) - (file-name (git-file-name (package-name simdjson) version)) - (sha256 - (base32 - "038i9nmk85vpxvs546w6cyci0ppdrrp5wnlv1kffxw29x71a3g5l")))))) - (define-public bloomberg-bde-tools (package (name "bloomberg-bde-tools") diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 86187dc3c0..fb93362f24 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -5343,13 +5343,16 @@ can receive input from a MIDI keyboard.") (string-append "CXX=" #$(cxx-for-target))) #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'patch-portaudio-path + (add-after 'unpack 'patch-portaudio-and-portmidi-paths (lambda* (#:key inputs #:allow-other-keys) (substitute* "src/sgui/widgets/hardware_dialog.py" (("\\\"libportaudio") (string-append "\"" (assoc-ref inputs "portaudio") - "/lib/libportaudio"))))) - (add-after 'patch-portaudio-path 'change-directory + "/lib/libportaudio")) + (("'libportmidi") + (string-append "'" (assoc-ref inputs "portmidi") + "/lib/libportmidi"))))) + (add-after 'patch-portaudio-and-portmidi-paths 'change-directory (lambda _ (chdir "src"))) (delete 'configure) ;no configure script @@ -5380,7 +5383,9 @@ can receive input from a MIDI keyboard.") `("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH"))) `("PATH" ":" prefix - (,(getenv "PATH"))))))))) + (,(getenv "PATH"))) + `("QT_PLUGIN_PATH" ":" prefix + (,(getenv "QT_PLUGIN_PATH"))))))))) (native-inputs (list pkg-config python-gcovr @@ -5396,8 +5401,9 @@ can receive input from a MIDI keyboard.") jq libsndfile portaudio - portmidi + portmidi-2 python + python-distro python-jinja2 python-mido python-mutagen @@ -5408,6 +5414,7 @@ can receive input from a MIDI keyboard.") python-pyyaml python-wavefile python-yq + qtwayland rubberband valgrind/pinned |