GNU bug report logs - #48186
[PATCH] gnu: emacs-rime: Adjust to changes in emacs-build-system.

Previous Next

Full log

View this message in rfc822 format

From: Z572 <873216071 <at> qq.com>
To: luhui <luhuins <at> 163.com>
Cc: 48186 <at> 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

[Message part 1 (text/plain, inline)]

I think #:include is better.

[0001-gnu-emacs-rime-Adjust-to-changes-in-emacs-build-syst.patch (text/x-patch, inline)]

From 3e4c22f82ad038e89de866198dccc7e793d185b6 Mon Sep 17 00:00:00 2001
From: Zheng junjie <873216071 <at> 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 <at> xsteve.at>
 ;;; Copyright © 2021 Simon Tournier <zimon.toutoune <at> gmail.com>
 ;;; Copyright © 2021 Eugene Klimov <lipklim <at> mailbox.org>
+;;; Copyright © 2021 Zheng Junjie <873216071 <at> 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

[Message part 3 (text/plain, inline)]

-- 
over

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.