* [bug#39740] [PATCH 0/2] uim: Do not install files in guix.d.
@ 2020-02-22 17:03 Arun Isaac
2020-02-22 17:11 ` [bug#39740] [PATCH 1/2] gnu: uim: Do not install elisp " Arun Isaac
0 siblings, 1 reply; 4+ messages in thread
From: Arun Isaac @ 2020-02-22 17:03 UTC (permalink / raw)
To: 39740; +Cc: Arun Isaac
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* [bug#39740] [PATCH 1/2] gnu: uim: Do not install elisp files in guix.d.
2020-02-22 17:03 [bug#39740] [PATCH 0/2] uim: Do not install files in guix.d Arun Isaac
@ 2020-02-22 17:11 ` Arun Isaac
2020-02-22 17:11 ` [bug#39740] [PATCH 2/2] gnu: uim: Use emacs-substitute-variables instead of substitute* Arun Isaac
0 siblings, 1 reply; 4+ messages in thread
From: Arun Isaac @ 2020-02-22 17:11 UTC (permalink / raw)
To: 39740; +Cc: Arun Isaac
* 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@gnu.org>
;;; Copyright © 2017, 2018, 2019 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com>
-;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
+;;; Copyright © 2017, 2020 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2018 Oleg Pykhalov <go.wigust@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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [bug#39740] [PATCH 2/2] gnu: uim: Use emacs-substitute-variables instead of substitute*.
2020-02-22 17:11 ` [bug#39740] [PATCH 1/2] gnu: uim: Do not install elisp " Arun Isaac
@ 2020-02-22 17:11 ` Arun Isaac
2020-03-13 9:08 ` bug#39740: " Arun Isaac
0 siblings, 1 reply; 4+ messages in thread
From: Arun Isaac @ 2020-02-22 17:11 UTC (permalink / raw)
To: 39740; +Cc: Arun Isaac
* 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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* bug#39740: [PATCH 2/2] gnu: uim: Use emacs-substitute-variables instead of substitute*.
2020-02-22 17:11 ` [bug#39740] [PATCH 2/2] gnu: uim: Use emacs-substitute-variables instead of substitute* Arun Isaac
@ 2020-03-13 9:08 ` Arun Isaac
0 siblings, 0 replies; 4+ messages in thread
From: Arun Isaac @ 2020-03-13 9:08 UTC (permalink / raw)
To: 39740-done
[-- Attachment #1: Type: text/plain, Size: 19 bytes --]
Pushed to master!
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-03-13 9:09 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-22 17:03 [bug#39740] [PATCH 0/2] uim: Do not install files in guix.d Arun Isaac
2020-02-22 17:11 ` [bug#39740] [PATCH 1/2] gnu: uim: Do not install elisp " Arun Isaac
2020-02-22 17:11 ` [bug#39740] [PATCH 2/2] gnu: uim: Use emacs-substitute-variables instead of substitute* Arun Isaac
2020-03-13 9:08 ` bug#39740: " Arun Isaac
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).