arunisaac pushed a commit to branch master
in repository guix.
commit acf6168b5dd1d5f03ad22966b27540d4457d2863
Author: Arun Isaac <[email protected]>
AuthorDate: Sat Feb 22 13:18:17 2020 +0530
gnu: uim: Do not install elisp files in guix.d.
* 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 f951e56..a7ba6fe 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -13,7 +13,7 @@
;;; Copyright © 2016, 2017 John Darrington <[email protected]>
;;; Copyright © 2017, 2018, 2019 Marius Bakke <[email protected]>
;;; Copyright © 2017, 2018, 2019 Rutger Helling <[email protected]>
-;;; Copyright © 2017 Arun Isaac <[email protected]>
+;;; Copyright © 2017, 2020 Arun Isaac <[email protected]>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <[email protected]>
;;; Copyright © 2018 Kei Kebreau <[email protected]>
;;; Copyright © 2018 Oleg Pykhalov <[email protected]>
@@ -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")
