diff options
Diffstat (limited to 'gnu/packages/mpd.scm')
| -rw-r--r-- | gnu/packages/mpd.scm | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index e99dd49adc..ea41f9e97e 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2016, 2018, 2019, 2020 Leo Famulari <leo@famulari.name> ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019 Evan Straw <evan.straw99@gmail.com> -;;; Copyright © 2020 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2020, 2021 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2020 Lars-Dominik Braun <lars@6xq.net> ;;; Copyright © 2020, 2021 Simon Streit <simon@netpanic.org> ;;; Copyright © 2021 Noah Evans <noah@nevans.me> @@ -120,8 +120,7 @@ interfacing MPD in the C, C++ & Objective C languages.") "0m67wibxc6n6438h2va59n51wwwbwhbdj9635cnpc3wqvlq9sd9g")))) (build-system meson-build-system) (arguments - `(#:meson ,meson-next ; Requires Meson >= 0.56.0 - #:configure-flags '("-Ddocumentation=enabled"))) + `(#:configure-flags '("-Ddocumentation=enabled"))) (inputs `(("ao" ,ao) ("alsa-lib" ,alsa-lib) ("avahi" ,avahi) @@ -408,15 +407,15 @@ other MPD frontends.") (add-after 'install 'wrap-program (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) - (python-path (getenv "PYTHONPATH"))) + (python-path (getenv "GUIX_PYTHONPATH"))) (wrap-program (string-append out "/bin/mpDris2") - `("PYTHONPATH" ":" prefix (,python-path))) + `("GUIX_PYTHONPATH" ":" prefix (,python-path))) #t)))))) (inputs `(("python-mpd2" ,python-mpd2) ("python-dbus" ,python-dbus) ("python-pygobject" ,python-pygobject) - ("python" ,python))) ; Sets PYTHONPATH. + ("python" ,python))) ; Sets GUIX_PYTHONPATH. ;; For bootstrapping. (native-inputs `(("autoconf" ,autoconf) @@ -507,9 +506,8 @@ artists along with albumart.") (let ((prog (string-append (assoc-ref outputs "out") "/bin/mcg"))) (wrap-program prog - `("PYTHONPATH" = (,(getenv "PYTHONPATH"))) - `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))) - #t))) + `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH"))) + `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))))) (add-after 'wrap-program 'glib-or-gtk-wrap (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) (synopsis "Covergrid for the MPD") |