mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-28 23:32:24 -05:00
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.
This commit is contained in:
parent
d1548cb09f
commit
acf6168b5d
1 changed files with 12 additions and 4 deletions
|
@ -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 @@ (define-public uim
|
|||
(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 @@ (define-public uim
|
|||
(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")
|
||||
|
|
Loading…
Reference in a new issue