From d986c345601654d7f04a5c82611b76c8da1d44aa Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 13 May 2022 14:29:15 -0400 Subject: [PATCH] gnu: mod-host: Update to 0.10.6-4.cdd30dd. * gnu/packages/music.scm (mod-host): Update to 0.10.6-4.cdd30dd. [source]: Use git-version and git-file-name. [arguments]: Use gexps. [phases]: Delete trailing #t. [inputs]: Replace jack-1 with jack-2. [native-inputs]: replace python-2 with python-wrapper. --- gnu/packages/music.scm | 43 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index b3989e11f9..554d70f266 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3401,11 +3401,11 @@ (define-public gxtuner (define-public mod-host ;; The last release was in 2014 but since then hundreds of commits have ;; been made. - (let ((commit "1726ad06b11323da7e1aaed690ff8aef91f702b5") - (revision "3")) + (let ((commit "cdd30ddbd2cc916be8a0364275071c3d8335b3a7") + (revision "4")) (package (name "mod-host") - (version (string-append "0.10.6-" revision "." (string-take commit 9))) + (version (git-version "0.10.6" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -3413,34 +3413,33 @@ (define-public mod-host (commit commit))) (sha256 (base32 - "1nrd37c35w6z6ldczgrwmmd9hx1n3zyvcjcgb3mi4cygqdanvspv")) - (file-name (string-append name "-" version "-checkout")))) + "1xnflvcyj071gn9nhv5dynd0v85nq99sz1wn3adlj43l5m4fbx3a")) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; no tests included - #:make-flags - (list (string-append "PREFIX=" (assoc-ref %outputs "out")) - "CC=gcc") - #:phases - (modify-phases %standard-phases - (delete 'configure) - (add-after 'unpack 'fix-jack-installation-directory - (lambda _ - ;; Do not attempt to install files to output of "jack" package. - (substitute* "Makefile" - (("\\$\\(shell pkg-config --variable=libdir jack\\)") - "lib")) - #t))))) + (list + #:tests? #f ; no tests included + #:make-flags + #~(list (string-append "PREFIX=" #$output) "CC=gcc") + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (add-after 'unpack 'fix-jack-installation-directory + (lambda _ + ;; Do not attempt to install files to output of "jack" package. + (substitute* "Makefile" + (("\\$\\(shell pkg-config --variable=libdir jack\\)") + "lib"))))))) (inputs (list lilv fftw fftwf lv2 - jack-1 + jack-2 readline)) (native-inputs - `(("pkg-config" ,pkg-config) - ("python" ,python-2))) + (list pkg-config + python-wrapper)) (home-page "https://github.com/moddevices/mod-host") (synopsis "LV2 host for Jack controllable via socket or command line") (description "mod-host is an LV2 plugin host for JACK, controllable via