diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-03-23 21:45:21 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-03-23 21:45:21 -0400 |
| commit | 839bb4616f13171a23ad7937bf57d0a01d61d42a (patch) | |
| tree | 01de78a5ce973b9fb7ac0f9216d64f736f8e163d /gnu/packages/ibus.scm | |
| parent | 0357bbbcd850f9220078a62da3c30358b8983765 (diff) | |
| parent | ef71e3290916583973724316e815cee840c1b6d8 (diff) | |
| download | guix-839bb4616f13171a23ad7937bf57d0a01d61d42a.tar guix-839bb4616f13171a23ad7937bf57d0a01d61d42a.tar.gz | |
Merge remote-tracking branch 'origin/master' into staging.
With resolved conflicts in:
gnu/packages/ibus.scm
gnu/packages/image.scm
gnu/packages/lisp.scm
gnu/packages/virtualization.scm
Diffstat (limited to 'gnu/packages/ibus.scm')
| -rw-r--r-- | gnu/packages/ibus.scm | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index b851426bc7..dd15d65105 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2021 Songlin Jiang <hollowman@hollowman.ml> ;;; Copyright © 2021 Taiju HIGASHI <higashi@taiju.info> ;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com> +;;; Copyright © 2023 Luis Felipe López Acevedo <luis.felipe.la@protonmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -887,6 +888,13 @@ hanja dictionary and small hangul character classification.") (substitute* "meson.build" (("update_desktop_database: true") "update_desktop_database: false")))) + (add-after 'set-paths 'add-install-to-pythonpath + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (ibus-stt-dir (string-append out "/share/ibus-stt"))) + (setenv "GUIX_PYTHONPATH" + (string-append ibus-stt-dir ":" + (getenv "GUIX_PYTHONPATH")))))) (add-after 'install 'wrap-with-additional-paths (lambda* (#:key inputs outputs #:allow-other-keys) ;; Make sure 'ibus-{setup,engine}-stt' find the gst-vosk plugin @@ -898,23 +906,14 @@ hanja dictionary and small hangul character classification.") (,(string-append (assoc-ref inputs "gst-vosk") "/lib/gstreamer-1.0") ,(getenv "GST_PLUGIN_SYSTEM_PATH"))) - `("GUIX_PYTHONPATH" ":" prefix - (,(getenv "GUIX_PYTHONPATH") - ,(string-append (assoc-ref inputs "ibus") - "/lib/girepository-1.0") - ,(string-append (assoc-ref outputs "out") - "/share/ibus-stt"))) - `("GI_TYPELIB_PATH" ":" prefix - (,(string-append (assoc-ref inputs "ibus") - "/lib/girepository-1.0") - ,(string-append (assoc-ref outputs "out") - "/share/ibus-stt"))))) + `("GUIX_PYTHONPATH" = + (,(getenv "GUIX_PYTHONPATH"))) + `("GI_TYPELIB_PATH" = + (,(getenv "GI_TYPELIB_PATH"))))) (list (string-append out "/libexec/ibus-engine-stt") (string-append out "/libexec/ibus-setup-stt"))))))))) (inputs - (list desktop-file-utils - (list glib "bin") - gobject-introspection + (list bash-minimal gst-vosk gstreamer gtk @@ -924,7 +923,11 @@ hanja dictionary and small hangul character classification.") python-babel python-pygobject)) (native-inputs - (list gettext-minimal libxml2 pkg-config)) + (list desktop-file-utils + gettext-minimal + (list glib "bin") + gobject-introspection + libxml2 pkg-config)) (home-page "https://github.com/PhilippeRo/IBus-Speech-To-Text") (synopsis "Speech to text IBus engine using VOSK") (description "This Input Method uses VOSK for voice recognition and allows |