diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 9b5ea768a76..171e5483803 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2016, 2018, 2019, 2020 Leo Famulari ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice ;;; Copyright © 2019 Evan Straw -;;; Copyright © 2020, 2021 Ricardo Wurmus +;;; Copyright © 2020, 2021, 2026 Ricardo Wurmus ;;; Copyright © 2020 Lars-Dominik Braun ;;; Copyright © 2020–2023 Simon Streit ;;; Copyright © 2021 Noah Evans @@ -392,7 +392,7 @@ interface for the Music Player Daemon.") (define-public sonata (package (name "sonata") - (version "1.7.0") + (version "1.7.3") (source (origin (method git-fetch) (uri (git-reference @@ -401,28 +401,36 @@ interface for the Music Player Daemon.") (file-name (git-file-name name version)) (sha256 (base32 - "0rl8w7s2asff626clzfvyz987l2k4ml5dg417mqp9v8a962q0v2x")))) - (build-system python-build-system) + "0jipamk3gq85kxhq8vd6sw5rjyiyx5cfadafikc5k0q0fw67w83v")))) + (build-system pyproject-build-system) (arguments - `(#:modules ((guix build gnu-build-system) - (guix build python-build-system) + (list + ;; Invalid command "test" + #:tests? #false + #:modules '((guix build gnu-build-system) + (guix build pyproject-build-system) ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) (guix build utils)) - #:imported-modules (,@%default-gnu-imported-modules - (guix build python-build-system) + #:imported-modules `(,@%pyproject-build-system-modules (guix build glib-or-gtk-build-system)) - #:phases - (modify-phases %standard-phases - (add-after 'install 'glib-or-gtk-wrap - (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)) - (add-after 'install 'wrap-sonata - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (gi-typelib-path (getenv "GI_TYPELIB_PATH"))) - (wrap-program (string-append out "/bin/sonata") - `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))))))))) + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'glib-or-gtk-wrap + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)) + (add-after 'unpack 'fix-importlib + (lambda _ + (substitute* "sonata/main.py" + (("importlib.resources.files\\(__name__\\)") + "importlib.resources.files(\"sonata\")")))) + (add-after 'wrap 'wrap-sonata + (lambda _ + (let ((gi-typelib-path (getenv "GI_TYPELIB_PATH"))) + (wrap-program (string-append #$output "/bin/sonata") + `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))))))))) (native-inputs - (list gettext-minimal)) + (list gettext-minimal + python-setuptools + python-wheel)) (inputs (list bash-minimal python-mpd2