GNU bug report logs - #39740
[PATCH 0/2] uim: Do not install files in guix.d.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 39740 in the body.
You can then email your comments to 39740 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Arun Isaac <arunisaac <at> systemreboot.net>
To: guix-patches <at> gnu.org
Cc: Arun Isaac <arunisaac <at> systemreboot.net>
Subject: [PATCH 0/2] uim: Do not install files in guix.d.
Date: Sat, 22 Feb 2020 22:33:16 +0530

Here are a couple of small fixes to our uim package.

Arun Isaac (2):
  gnu: uim: Do not install elisp files in guix.d.
  gnu: uim: Use emacs-substitute-variables instead of substitute*.

 gnu/packages/xorg.scm | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

-- 
2.23.0

Message #8 received at 39740 <at> debbugs.gnu.org (full text, mbox):

From: Arun Isaac <arunisaac <at> systemreboot.net>
To: 39740 <at> debbugs.gnu.org
Cc: Arun Isaac <arunisaac <at> systemreboot.net>
Subject: [PATCH 2/2] gnu: uim: Use emacs-substitute-variables instead of
 substitute*.
Date: Sat, 22 Feb 2020 22:41:44 +0530

* gnu/packages/xorg.scm (uim)[arguments]: In the configure-uim-el phase, use
emacs-substitute-variables instead of substitute*.
---
 gnu/packages/xorg.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index a7ba6fe9eb..2bf920b20d 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -6145,10 +6145,10 @@ X11 servers, Windows, or macOS.")
          ;; Set path of uim-el-agent and uim-el-helper-agent executables
          (add-after 'configure 'configure-uim-el
            (lambda* (#:key outputs #:allow-other-keys)
-             (substitute* "emacs/uim-var.el"
-               (("\"(uim-el-agent|uim-el-helper-agent)\"" _ executable)
-                (string-append "\"" (assoc-ref outputs "out")
-                               "/bin/" executable "\"")))
+             (let ((out (assoc-ref outputs "out")))
+               (emacs-substitute-variables "emacs/uim-var.el"
+                 ("uim-el-agent" (string-append out "/bin/uim-el-agent"))
+                 ("uim-el-helper-agent" (string-append out "/bin/uim-el-helper-agent"))))
              #t))
          ;; Fix installation path by renaming share/emacs/uim-el to
          ;; share/emacs/site-lisp
-- 
2.23.0

Message #11 received at 39740 <at> debbugs.gnu.org (full text, mbox):

From: Arun Isaac <arunisaac <at> systemreboot.net>
To: 39740 <at> debbugs.gnu.org
Cc: Arun Isaac <arunisaac <at> systemreboot.net>
Subject: [PATCH 1/2] gnu: uim: Do not install elisp files in guix.d.
Date: Sat, 22 Feb 2020 22:41:43 +0530

* gnu/packages/xorg.scm (uim)[arguments]: Pass %output/share/emacs to the
--with-lispdir configure flag. Add fix-install-path phase after install phase.
---
 gnu/packages/xorg.scm | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index f951e565ff..a7ba6fe9eb 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -13,7 +13,7 @@
 ;;; Copyright © 2016, 2017 John Darrington <jmd <at> gnu.org>
 ;;; Copyright © 2017, 2018, 2019 Marius Bakke <mbakke <at> fastmail.com>
 ;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling <at> mykolab.com>
-;;; Copyright © 2017 Arun Isaac <arunisaac <at> systemreboot.net>
+;;; Copyright © 2017, 2020 Arun Isaac <arunisaac <at> systemreboot.net>
 ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me <at> tobias.gr>
 ;;; Copyright © 2018 Kei Kebreau <kkebreau <at> posteo.net>
 ;;; Copyright © 2018 Oleg Pykhalov <go.wigust <at> gmail.com>
@@ -6137,8 +6137,7 @@ X11 servers, Windows, or macOS.")
                            (guix build emacs-utils))
        #:configure-flags
        (list "--with-anthy-utf8"
-             (string-append "--with-lispdir=" %output
-                            "/share/emacs/site-lisp/guix.d")
+             (string-append "--with-lispdir=" %output "/share/emacs")
              ;; Set proper runpath
              (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib"))
        #:phases
@@ -6151,8 +6150,17 @@ X11 servers, Windows, or macOS.")
                 (string-append "\"" (assoc-ref outputs "out")
                                "/bin/" executable "\"")))
              #t))
+         ;; Fix installation path by renaming share/emacs/uim-el to
+         ;; share/emacs/site-lisp
+         (add-after 'install 'fix-install-path
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((share-emacs (string-append (assoc-ref outputs "out")
+                                               "/share/emacs")))
+               (rename-file (string-append share-emacs "/uim-el")
+                            (string-append share-emacs "/site-lisp")))
+             #t))
          ;; Generate emacs autoloads for uim.el
-         (add-after 'install 'make-autoloads
+         (add-after 'fix-install-path 'make-autoloads
            (lambda* (#:key outputs #:allow-other-keys)
              (emacs-generate-autoloads
               ,name (string-append (assoc-ref outputs "out")
-- 
2.23.0

Message #16 received at 39740-done <at> debbugs.gnu.org (full text, mbox):

From: Arun Isaac <arunisaac <at> systemreboot.net>
To: 39740-done <at> debbugs.gnu.org
Subject: Re: [PATCH 2/2] gnu: uim: Use emacs-substitute-variables instead of
 substitute*.
Date: Fri, 13 Mar 2020 14:38:09 +0530

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

Pushed to master!

[signature.asc (application/pgp-signature, inline)]

Previous Next

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