all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: luhui <luhuins@163.com>
To: 48186@debbugs.gnu.org
Subject: [bug#48186] [PATCH] gnu: emacs-rime: Adjust to changes in emacs-build-system.
Date: Mon, 3 May 2021 21:43:42 +0800	[thread overview]
Message-ID: <YI/+DhCQmYG/DMnv@thinkpad-x230-luhui> (raw)

[-- Attachment #1: Type: text/plain, Size: 76 bytes --]

Because of the update of emacs-build-system it cannot run correctly, fix it.

[-- Attachment #2: 0001-gnu-emacs-rime-Adjust-to-changes-in-emacs-build-syst.patch --]
[-- Type: text/plain, Size: 1965 bytes --]

From 10b339344ac01724a19d8efa137425f4eba83cad Mon Sep 17 00:00:00 2001
From: luhui <luhuins@163.com>
Date: Mon, 3 May 2021 20:22:43 +0800
Subject: [PATCH] gnu: emacs-rime: Adjust to changes in emacs-build-system.

* gnu/packages/emacs-xyz.scm (emacs-rime):
[#:phases]: add patch-rime-module-path, change install-emacs-module
---
 gnu/packages/emacs-xyz.scm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index dbeab25b39..9afe343a14 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -97,6 +97,7 @@
 ;;; Copyright © 2021 Stefan Reichör <stefan@xsteve.at>
 ;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com>
 ;;; Copyright © 2021 Eugene Klimov <lipklim@mailbox.org>
+;;; Copyright © 2021 lu hui <luhuins@163.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -25706,6 +25707,13 @@ REPL appropriate to the current major mode.")
     (arguments
      '(#:phases
        (modify-phases %standard-phases
+         (add-after 'unpack 'patch-rime-module-path
+           (lambda* (#:key outputs #:allow-other-keys)
+             (make-file-writable "rime.el")
+             (emacs-substitute-variables "rime.el"
+               ("rime--module-path"
+                (string-append (assoc-ref outputs "out") "/lib/librime-emacs.so")))
+             #t))
          (add-after 'unpack 'patch-rime-data-path
            (lambda* (#:key inputs #:allow-other-keys)
              (make-file-writable "rime.el")
@@ -25721,7 +25729,7 @@ REPL appropriate to the current major mode.")
            (lambda* (#:key outputs #:allow-other-keys)
              (install-file "librime-emacs.so"
                            (string-append (assoc-ref outputs "out")
-                                          "/share/emacs/site-lisp"))
+                                          "/lib/"))
              #t)))))
     (inputs
      `(("librime" ,librime)
-- 
2.31.1


             reply	other threads:[~2021-05-03 13:45 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-03 13:43 luhui [this message]
2021-05-11 16:16 ` [bug#48186] [PATCH] gnu: emacs-rime: Adjust to changes in emacs-build-system Z572
2021-05-11 16:16   ` Z572
2021-05-11 17:32   ` Leo Prikler

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=YI/+DhCQmYG/DMnv@thinkpad-x230-luhui \
    --to=luhuins@163.com \
    --cc=48186@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

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

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.