119/163: gnu: komikku: Wrap with the new Guix PYTHONPATH.

[guix-commits]

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

commit f077781fecdc8f2e723fdb1824502a3bd9a33d3f
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sun Jan 24 00:20:54 2021 -0500

    gnu: komikku: Wrap with the new Guix PYTHONPATH.
    
    * gnu/packages/gnome.scm (komikku): 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, 13 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 4822a3c..81547c4 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -11866,7 +11866,12 @@ integrated profiler via Sysprof, debugging support, 
and more.")
          "010p32zrim245y0l784yp0rasqcqlyr3lrxwl3r1876x83qhs6q3"))))
     (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 'patch-sources
@@ -11879,16 +11884,16 @@ integrated profiler via Sysprof, debugging support, 
and more.")
          (add-after 'unpack 'skip-gtk-update-icon-cache
            (lambda _
              (substitute* "meson_post_install.py"
-               (("gtk-update-icon-cache") (which "true")))
-             #t))
+               (("gtk-update-icon-cache")
+                (which "true")))))
          (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/komikku")))
+                                       "/bin/komikku"))
+                  (pythonpath (guix-pythonpath inputs)))
               (wrap-program prog
-                `("PYTHONPATH" = (,(getenv "PYTHONPATH")))
-                `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))
-              #t))))))
+                `(,pythonpath = (,(getenv pythonpath)))
+                `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))))))))
     (inputs
      `(("gtk+" ,gtk+)
        ("libhandy" ,libhandy)