115/163: gnu: orca: Wrap with the new Guix PYTHONPATH.

[guix-commits]

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

commit a0431c1d9b4a5a2c899d53efed566347d578b6cd
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sun Jan 24 00:13:59 2021 -0500

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

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index b2d55b6..fe1795e 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -10041,27 +10041,30 @@ accessibility infrastructure.")
                 "1q38n7hyshkiszmn361skxjynxr31lcms7a1iny6d0zlpmh1vnk4"))))
     (build-system glib-or-gtk-build-system)
     (arguments
-     '(#:phases
+     '(#:imported-modules ,(cons '(guix build python-build-system)
+                                 %glib-or-gtk-build-system-modules)
+       #:modules ((guix build glib-or-gtk-build-system)
+                  ((guix build python-build-system) #:select (guix-pythonpath))
+                  (guix build utils))
+       #:phases
        (modify-phases %standard-phases
          (add-before 'configure 'qualify-xkbcomp
            (lambda* (#:key inputs #:allow-other-keys)
              (let ((xkbcomp (string-append
                              (assoc-ref inputs "xkbcomp") "/bin/xkbcomp")))
                (substitute* "src/orca/orca.py"
-                 (("'xkbcomp'") (format #f "'~a'" xkbcomp))))
-             #t))
+                 (("'xkbcomp'") (format #f "'~a'" xkbcomp))))))
          (add-after 'install 'wrap-orca
            (lambda* (#:key outputs #:allow-other-keys)
              (let* ((out  (assoc-ref outputs "out"))
-                    (prog (string-append out "/bin/orca")))
+                    (prog (string-append out "/bin/orca"))
+                    (pythonpath (guix-pythonpath inputs)))
                (wrap-program prog
                  `("GI_TYPELIB_PATH" ":" prefix
                    (,(getenv "GI_TYPELIB_PATH")))
                  `("GST_PLUGIN_SYSTEM_PATH" ":" prefix
                    (,(getenv "GST_PLUGIN_SYSTEM_PATH")))
-                 `("PYTHONPATH" ":" prefix
-                   (,(getenv "PYTHONPATH")))))
-             #t)))))
+                 `(,pythonpath ":" prefix (,(getenv pythonpath))))))))))
     (native-inputs
      `(("intltool" ,intltool)
        ("itstool" ,itstool)