branch master updated: gnu: autokey: Fix paths.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

ngz pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 29fc4a7dae gnu: autokey: Fix paths.
29fc4a7dae is described below

commit 29fc4a7daeae5d4d2c5385dbf6ae05fcbf302eb0
Author: John Kehayias <john.kehayias@protonmail.com>
AuthorDate: Fri Jan 14 15:26:36 2022 -0500

    gnu: autokey: Fix paths.
    
    * gnu/packages/python-xyz.scm (autokey): Add comments on the disabled tests
    and GI_TYPELIB_PATH wrapping.
    [inputs]: Add ipython.
    [phases]{fix-paths}: Use paths to ipython3 and python3 in autokey-shell
    script.
    {wrap-autokey}: Change name to...
    {wrap-autokey-gi}: ...this and move to before wrap for clarity.
    
    Signed-off-by: Nicolas Goaziou <mail@nicolasgoaziou.fr>
---
 gnu/packages/python-xyz.scm | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 76333138bc..404ad8b9bc 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -4212,7 +4212,9 @@ structure for Python.")
     (build-system python-build-system)
     (arguments
      (list
-      #:tests? #f ; Tests are deprecated/broken until next version.
+      ;; Tests are deprecated and broken until next version, see
+      ;; https://github.com/autokey/autokey/issues/327
+      #:tests? #f
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'unpack 'fix-paths
@@ -4221,8 +4223,16 @@ structure for Python.")
                 (("\"wmctrl\"")
                  (string-append "\"" (search-input-file inputs "bin/wmctrl") 
"\""))
                 (("\"zenity\"")
-                 (string-append "\"" (search-input-file inputs "bin/zenity") 
"\"")))))
-          (add-after 'install 'wrap-autokey
+                 (string-append "\"" (search-input-file inputs "bin/zenity") 
"\"")))
+              (substitute* "autokey-shell"
+                (("'ipython3'")
+                 (string-append "'" (search-input-file inputs "bin/ipython3") 
"'"))
+                (("'python3'")
+                 (string-append "'" (search-input-file inputs "bin/python3") 
"'")))))
+          ;; Use 'prefix' instead of '=' to allow the user to use additional
+          ;; GI paths from their autokey scripts.  GUIX_PYTHONPATH is already
+          ;; wrapped with prefix in python-build-system's wrap.
+          (add-before 'wrap 'wrap-autokey-gi
             (lambda _
               (let ((gi-typelib-path (getenv "GI_TYPELIB_PATH")))
                 (for-each
@@ -4238,14 +4248,14 @@ structure for Python.")
            gtksourceview-3
            libappindicator
            libnotify
-           wmctrl
-           zenity))
-    (propagated-inputs
-     (list python-dbus
+           python-dbus
+           python-ipython
            python-pygobject
            python-pyinotify
            python-pyqt+qscintilla
-           python-xlib))
+           python-xlib
+           wmctrl
+           zenity))
     (home-page "https://github.com/autokey/autokey";)
     (synopsis
       "Keyboard and GUI automation utility")