116/163: gnu: passwordsafe: Wrap with the new Guix PYTHONPATH.

[guix-commits]

apteryx pushed a commit to branch cu/farewell-to-pythonpath
in repository guix.

commit ded7e49e6540707e27673125849debd4510f585b
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sun Jan 24 00:15:52 2021 -0500

    gnu: passwordsafe: Wrap with the new Guix PYTHONPATH.
    
    * gnu/packages/gnome.scm (passwordsafe): Delete trailing #t.
    [arguments]: Import and use the (guix build python-build-system) module.
    [phases]{python-and-gi-wrap}: Wrap with the new Guix PYTHONPATH.
---
 gnu/packages/gnome.scm | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index fe1795e..0a0a653 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -10382,22 +10382,23 @@ apply fancy special effects and lets you share the 
fun with others.")
         (base32 "0pi2l4gwf8paxm858mxrcsk5nr0c0zw5ycax40mghndb6b1qmmhf"))))
     (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 'glib-or-gtk-wrap 'python-and-gi-wrap
-           (lambda* (#:key outputs #:allow-other-keys)
+           (lambda* (#:key inputs outputs #:allow-other-keys)
              (let ((prog (string-append (assoc-ref outputs "out")
                                         "/bin/gnome-passwordsafe"))
-                   (pylib (string-append (assoc-ref outputs "out")
-                                         "/lib/python"
-                                         ,(version-major+minor
-                                           (package-version python))
-                                         "/site-packages")))
+                   (pythonpath (guix-pythonpath inputs))
+                   (site (site-packages inputs outputs)))
                (wrap-program prog
-                 `("PYTHONPATH" = (,(getenv "PYTHONPATH") ,pylib))
-                 `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))
-               #t))))))
+                 `(,pythonpath = (,(getenv pythonpath) ,site))
+                 `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))))))))
     (native-inputs
      `(("desktop-file-utils" ,desktop-file-utils)
        ("gettext" ,gettext-minimal)