From: Z572 <873216071@qq.com>
To: luhui <luhuins@163.com>
Cc: 48186@debbugs.gnu.org
Subject: [bug#48186] [PATCH] gnu: emacs-rime: Adjust to changes in emacs-build-system.
Date: Wed, 12 May 2021 00:16:45 +0800 [thread overview]
Message-ID: <tencent_5B48E7A97CB924B9166FD329B5364BF9EF05@qq.com> (raw)
Message-ID: <87k0o51c0i.fsf@qq.com> (raw)
In-Reply-To: <YI/+DhCQmYG/DMnv@thinkpad-x230-luhui> (luhui's message of "Mon, 3 May 2021 21:43:42 +0800")
[-- Attachment #1: Type: text/plain, Size: 31 bytes --]
I think #:include is better.
[-- Attachment #2: 0001-gnu-emacs-rime-Adjust-to-changes-in-emacs-build-syst.patch --]
[-- Type: text/x-patch, Size: 2040 bytes --]
From 3e4c22f82ad038e89de866198dccc7e793d185b6 Mon Sep 17 00:00:00 2001
From: Zheng junjie <873216071@qq.com>
Date: Tue, 11 May 2021 23:44:44 +0800
Subject: [PATCH] gnu: emacs-rime: Adjust to changes in emacs-build-system.
* gnu/packages/emacs-xyz.scm (emacs-rime):[arguments]: Use #:include rather
than #:phases to add librime-emacs.so.
---
gnu/packages/emacs-xyz.scm | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index fc4c03965e..ff90c6bd3a 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 Zheng Junjie <873216071@qq.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -25720,7 +25721,8 @@ REPL appropriate to the current major mode.")
(base32 "1a50cziwg7lpgh26yvwxs46jfyfq1m0l6igbg5g5m288mz4d3an9"))))
(build-system emacs-build-system)
(arguments
- '(#:phases
+ '(#:include (cons "\\.so$" %default-include)
+ #:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-rime-data-path
(lambda* (#:key inputs #:allow-other-keys)
@@ -25732,13 +25734,7 @@ REPL appropriate to the current major mode.")
#t))
(add-before 'install 'build-emacs-module
(lambda _
- (invoke "make" "lib")))
- (add-after 'install 'install-emacs-module
- (lambda* (#:key outputs #:allow-other-keys)
- (install-file "librime-emacs.so"
- (string-append (assoc-ref outputs "out")
- "/share/emacs/site-lisp"))
- #t)))))
+ (invoke "make" "lib"))))))
(inputs
`(("librime" ,librime)
("rime-data" ,rime-data)))
--
2.31.1
[-- Attachment #3: Type: text/plain, Size: 10 bytes --]
--
over
next prev parent reply other threads:[~2021-05-11 16:22 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-03 13:43 [bug#48186] [PATCH] gnu: emacs-rime: Adjust to changes in emacs-build-system luhui
[not found] ` <87k0o51c0i.fsf@qq.com>
2021-05-11 16:16 ` Z572 [this message]
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
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tencent_5B48E7A97CB924B9166FD329B5364BF9EF05@qq.com \
--to=873216071@qq.com \
--cc=48186@debbugs.gnu.org \
--cc=luhuins@163.com \
/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 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).