[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/15: gnu: emacs-mew: Adjust to changes in emacs-build-system.
From: |
guix-commits |
Subject: |
05/15: gnu: emacs-mew: Adjust to changes in emacs-build-system. |
Date: |
Wed, 1 Nov 2023 15:53:03 -0400 (EDT) |
lilyp pushed a commit to branch emacs-team
in repository guix.
commit a5eb6fa52f320675b7007831957ce4408aff31e1
Author: Liliana Marie Prikler <liliana.prikler@gmail.com>
AuthorDate: Thu Oct 19 06:53:11 2023 +0200
gnu: emacs-mew: Adjust to changes in emacs-build-system.
* gnu/packages/mail.scm (emacs-mew)[arguments]: Only let-bind icon-dir.
<#:modules>: Add (guix build emacs-build-system).
<#:imported-modules>: Use %emacs-build-system-modules.
<#:configure-flags>: Set elispdir with emacs:elpa-directory.
<#:phases>: Move ‘generate-autoloads’ after ‘unpack’.
Generate the autoloads locally.
Also enable compilation.
---
gnu/packages/mail.scm | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 89087b0708..a69154e653 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -1167,17 +1167,17 @@ repository and Maildir/IMAP as LOCAL repository.")
"0xazygwdc328m5l31rxjazq9giv2xrygp2p2q455lf3jhdxwq1km"))))
(build-system gnu-build-system)
(arguments
- (let ((elisp-dir #~(string-append #$output "/share/emacs/site-lisp"))
- (icon-dir #~(string-append #$output "/share/mew")))
+ (let ((icon-dir #~(string-append #$output "/share/mew")))
(list
#:modules '((guix build gnu-build-system)
(guix build utils)
+ ((guix build emacs-build-system) #:prefix emacs:)
(guix build emacs-utils))
- #:imported-modules `(,@%gnu-build-system-modules
- (guix build emacs-utils))
+ #:imported-modules %emacs-build-system-modules
#:tests? #f
#:configure-flags
- #~(list (string-append "--with-elispdir=" #$elisp-dir)
+ #~(list (string-append "--with-elispdir="
+ (emacs:elpa-directory #$output))
(string-append "--with-etcdir=" #$icon-dir))
#:phases
#~(modify-phases %standard-phases
@@ -1188,9 +1188,15 @@ repository and Maildir/IMAP as LOCAL repository.")
`(progn
(add-to-list 'image-load-path 'mew-icon-directory)
,#$icon-dir)))))
- (add-after 'install 'generate-autoloads
+ (add-after 'unpack 'generate-autoloads
(lambda _
- (emacs-generate-autoloads "mew" #$elisp-dir)))))))
+ (emacs-generate-autoloads "mew" "elisp")
+ (substitute* "elisp/mew-autoloads.el"
+ ((";; no-byte-compile.*") ""))
+ ;; Add generated autoloads to Makefile, so they get compiled
+ (substitute* "elisp/Makefile"
+ (("OBJS =") "OBJS = mew-autoloads.elc")
+ (("SRCS =") "SRCS = mew-autoloads.el"))))))))
(native-inputs
(list emacs))
(propagated-inputs
- branch emacs-team updated (8d6b3dd0b8 -> 60c97924e9), guix-commits, 2023/11/01
- 05/15: gnu: emacs-mew: Adjust to changes in emacs-build-system.,
guix-commits <=
- 04/15: gnu: translate-shell: Compile emacs bytecode., guix-commits, 2023/11/01
- 06/15: gnu: crm114: Adjust to changes in emacs-build-system., guix-commits, 2023/11/01
- 08/15: gnu: uim: Keep Emacs files in subdirectory., guix-commits, 2023/11/01
- 01/15: guix: emacs-build-system: Process package source in build tree., guix-commits, 2023/11/01
- 02/15: gnu: skktools: Build autoloads before installing them., guix-commits, 2023/11/01
- 03/15: gnu: translate-shell: Build autoloads before installing them., guix-commits, 2023/11/01
- 09/15: gnu: emacs-geiser-guile: Process autoloads in-tree., guix-commits, 2023/11/01
- 07/15: gnu: guile-wisp: Build autoloads before installing them., guix-commits, 2023/11/01
- 10/15: gnu: emacs-geiser-gauche: Process autoloads in-tree., guix-commits, 2023/11/01
- 11/15: gnu: emacs-geiser-racket: Process autoloads in-tree., guix-commits, 2023/11/01