apteryx pushed a commit to branch cu/farewell-to-pythonpath in repository guix.
commit 1eccbb34a4916beaf12bbea7d674cf6b5842ed8c Author: Maxim Cournoyer <[email protected]> AuthorDate: Sun Jan 24 00:00:16 2021 -0500 gnu: eolie: Wrap with the new Guix PYTHONPATH. * gnu/packages/gnome.scm (eolie): Delete trailing #t. [arguments]: Import and use the (guix build python-build-system) module. [phases]{wrap-more}: Wrap with the new Guix PYTHONPATH. --- gnu/packages/gnome.scm | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 672ed49..eb77148 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6531,15 +6531,19 @@ almost all of them.") "1vzhfp8j1z3jvd5ndqfyn7nqrx3zdvx9mv1byjl36nnd9g63ji62")))) (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 'unpack 'skip-gtk-update-icon-cache ;; Don't create 'icon-theme.cache'. (lambda _ (substitute* "meson_post_install.py" - (("gtk-update-icon-cache") "true")) - #t)) + (("gtk-update-icon-cache") "true")))) (add-after 'wrap 'wrap-more (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -6551,12 +6555,12 @@ almost all of them.") (map (lambda (lib) (string-append (assoc-ref inputs lib) "/lib")) libs) - ":"))) + ":")) + (pythonpath (guix-pythonpath inputs))) (wrap-program (string-append out "/bin/eolie") `("LD_LIBRARY_PATH" ":" prefix (,path)) - `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH"))) - `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))) - #t))))) + `(,pythonpath ":" prefix (,(getenv pythonpath))) + `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))))))))) (native-inputs `(("intltool" ,intltool) ("itstool" ,itstool)
