From acf6168b5dd1d5f03ad22966b27540d4457d2863 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sat, 22 Feb 2020 13:18:17 +0530 Subject: 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(-) (limited to 'gnu/packages/xorg.scm') 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 ;;; Copyright © 2017, 2018, 2019 Marius Bakke ;;; Copyright © 2017, 2018, 2019 Rutger Helling -;;; Copyright © 2017 Arun Isaac +;;; Copyright © 2017, 2020 Arun Isaac ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Kei Kebreau ;;; Copyright © 2018 Oleg Pykhalov @@ -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") -- cgit v1.2.3 From d5b0aa99f8d339b13dbea504bdb9a230e59915a0 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sat, 22 Feb 2020 22:06:06 +0530 Subject: gnu: uim: Use emacs-substitute-variables instead of substitute*. * 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(-) (limited to 'gnu/packages/xorg.scm') 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 @@ (define-public uim ;; 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 -- cgit v1.2.3