117/163: gnu: terminator: Wrap with the new Guix PYTHONPATH.

[guix-commits]

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

commit 2c23fd0cdaaa08fa3cc1b1ad42d1f73b4e40b3c4
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sun Jan 24 00:17:44 2021 -0500

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

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 0a0a653..787da0e 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -10805,20 +10805,15 @@ advanced image management tool")
                   (guix build utils))
        #:phases
        (modify-phases %standard-phases
-         (add-after
-          'install 'wrap-program
-          (lambda* (#:key outputs #:allow-other-keys)
+         (add-after 'install 'wrap-program
+          (lambda* (#:key inputs outputs #:allow-other-keys)
             (let ((prog (string-append (assoc-ref outputs "out")
                                        "/bin/terminator"))
-                  (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")))))))
          (add-after 'wrap-program 'glib-or-gtk-wrap
            (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)))))
     (home-page "https://gnome-terminator.org/";)