unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#38849] Fix IBus-Rime
@ 2020-01-01 10:28 kanichos
  2020-01-06 14:26 ` bug#38849: " Ludovic Courtès
  0 siblings, 1 reply; 2+ messages in thread
From: kanichos @ 2020-01-01 10:28 UTC (permalink / raw)
  To: 38849

IBus uses the component file rime.xml to start the Rime engine. It must be patched with appropriate paths.

---
 gnu/packages/ibus.scm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm
index 42a8d5db32..7daefde021 100644
--- a/gnu/packages/ibus.scm
+++ b/gnu/packages/ibus.scm
@@ -668,6 +668,10 @@ Method Engine.")
                                (assoc-ref inputs "rime-data")
                                "/share/rime-data\"\n")))
              #t))
+         (add-after 'unpack 'fix-paths
+           (lambda* (#:key outputs #:allow-other-keys)
+             (substitute* "rime.xml"
+               (("/usr") (assoc-ref outputs "out"))) #t))
          (delete 'configure))))
     (inputs
      `(("gdk-pixbuf" ,gdk-pixbuf)
-- 
2.23.0

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* bug#38849: Fix IBus-Rime
  2020-01-01 10:28 [bug#38849] Fix IBus-Rime kanichos
@ 2020-01-06 14:26 ` Ludovic Courtès
  0 siblings, 0 replies; 2+ messages in thread
From: Ludovic Courtès @ 2020-01-06 14:26 UTC (permalink / raw)
  To: kanichos; +Cc: 38849-done

Hello,

kanichos@yandex.ru skribis:

> IBus uses the component file rime.xml to start the Rime engine. It must be patched with appropriate paths.
>
> ---
>  gnu/packages/ibus.scm | 4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm
> index 42a8d5db32..7daefde021 100644
> --- a/gnu/packages/ibus.scm
> +++ b/gnu/packages/ibus.scm
> @@ -668,6 +668,10 @@ Method Engine.")
>                                 (assoc-ref inputs "rime-data")
>                                 "/share/rime-data\"\n")))
>               #t))
> +         (add-after 'unpack 'fix-paths
> +           (lambda* (#:key outputs #:allow-other-keys)
> +             (substitute* "rime.xml"
> +               (("/usr") (assoc-ref outputs "out"))) #t))

I made the following changes:

  1. Move the explanation as a comment in the code.

  2. Write “file name” instead of “path”, for consistency.

  3. Write a commit log that follows the project’s conventions.

Committed now, thank you!

Ludo’.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2020-01-06 14:28 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-01 10:28 [bug#38849] Fix IBus-Rime kanichos
2020-01-06 14:26 ` bug#38849: " Ludovic Courtès

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).