apteryx pushed a commit to branch cu/farewell-to-pythonpath in repository guix.
commit f4fc0a0dead4c02ff933ae0fbf948b8c1004c29c Author: Maxim Cournoyer <[email protected]> AuthorDate: Sun Jan 24 00:12:41 2021 -0500 gnu: gnome-todo: Wrap with the new Guix PYTHONPATH. * gnu/packages/gnome.scm (gnome-todo): Delete trailing #t. [arguments]: Import and use the (guix build python-build-system) module. [phases]{python-gnome-todo}: Wrap with the new Guix PYTHONPATH. --- gnu/packages/gnome.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 601d2bb..b2d55b6 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9439,21 +9439,25 @@ desktop. It supports multiple calendars, month, week and year view.") (search-patches "gnome-todo-delete-esource-duplicate.patch")))) (build-system meson-build-system) (arguments - '(#:glib-or-gtk? #t + '(#:imported-modules ,(cons '(guix build python-build-system) + %meson-build-system-modules) + #:modules ((guix build meson-build-system) + ((guix build python-build-system) #:select (guix-pythonpath)) + (guix build utils)) + #:glib-or-gtk? #t #:phases (modify-phases %standard-phases (add-after 'install 'wrap-gnome-todo (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) (gi-typelib-path (getenv "GI_TYPELIB_PATH")) - (python-path (getenv "PYTHONPATH"))) + (pythonpath (guix-pythonpath inputs))) (wrap-program (string-append out "/bin/gnome-todo") ;; XXX: gi plugins are broken. ;; See https://bugzilla.gnome.org/show_bug.cgi?id=787212 ;; For plugins. `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)) - `("PYTHONPATH" ":" prefix (,python-path)))) - #t))))) + `(,pythonpath ":" prefix (,(getenv pythonpath)))))))))) (native-inputs `(("gettext" ,gettext-minimal) ("gobject-introspection" ,gobject-introspection)
