From b520ad2781b7be1660adeccdc4f7ddc09e7f2b49 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Thu, 19 Oct 2023 07:16:18 +0200 Subject: gnu: uim: Keep Emacs files in subdirectory. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xorg.scm (uim)[arguments]<#:configure-flags>: Drop “--with-lispdir”. <#:phases>: Drop ‘fix-install-path’. Adjust ‘make-autoloads’ accordingly. --- gnu/packages/xorg.scm | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'gnu/packages/xorg.scm') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index f65ffa7476..bbaa432142 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6298,7 +6298,6 @@ X11 servers, Windows, or macOS.") (guix build emacs-utils)) #:configure-flags (list "--with-anthy-utf8" - (string-append "--with-lispdir=" %output "/share/emacs") ;; Set proper runpath (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib") "CFLAGS=-O2 -g -fcommon") @@ -6312,21 +6311,11 @@ X11 servers, Windows, or macOS.") ("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 - (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 'fix-install-path 'make-autoloads (lambda* (#:key outputs #:allow-other-keys) (emacs-generate-autoloads ,name (string-append (assoc-ref outputs "out") - "/share/emacs/site-lisp")) + "/share/emacs/site-lisp/uim-el")) #t))))) (home-page "https://github.com/uim/uim") (synopsis "Multilingual input method framework") -- cgit v1.2.3