From: Liliana Marie Prikler <liliana.prikler@gmail.com>
To: 66624@debbugs.gnu.org
Cc: andrew@trop.in, cox.katherine.e+guix@gmail.com,
liliana.prikler@gmail.com
Subject: [bug#66624] [PATCH emacs-team 05/15] gnu: emacs-mew: Adjust to changes in emacs-build-system.
Date: Thu, 19 Oct 2023 06:53:11 +0200 [thread overview]
Message-ID: <2d1de384f6a5c83c74e46ea090409952dc1c59c5.1697694142.git.liliana.prikler@gmail.com> (raw)
In-Reply-To: <cover.1697694142.git.liliana.prikler@gmail.com>
* 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 be458a2d92..84c7275ef6 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -1165,17 +1165,17 @@ (define-public emacs-mew
"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
@@ -1186,9 +1186,15 @@ (define-public emacs-mew
`(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
--
2.41.0
next prev parent reply other threads:[~2023-10-19 5:54 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-19 5:42 [bug#66624] [PATCH emacs-team 00/15] Start reworking emacs-build-system Liliana Marie Prikler
2023-10-19 4:06 ` [bug#66624] [PATCH emacs-team 01/15] guix: emacs-build-system: Process package source in build tree Liliana Marie Prikler
2023-10-23 8:41 ` Andrew Tropin
2023-11-01 19:54 ` Liliana Marie Prikler
2023-11-02 9:32 ` bug#66624: " Liliana Marie Prikler
2023-10-19 4:10 ` [bug#66624] [PATCH emacs-team 09/15] gnu: emacs-geiser-guile: Process autoloads in-tree Liliana Marie Prikler
2023-10-19 4:14 ` [bug#66624] [PATCH emacs-team 02/15] gnu: skktools: Build autoloads before installing them Liliana Marie Prikler
2023-10-19 4:29 ` [bug#66624] [PATCH emacs-team 03/15] gnu: translate-shell: " Liliana Marie Prikler
2023-10-19 4:30 ` [bug#66624] [PATCH emacs-team 04/15] gnu: translate-shell: Compile emacs bytecode Liliana Marie Prikler
2023-10-19 4:53 ` Liliana Marie Prikler [this message]
2023-10-19 5:03 ` [bug#66624] [PATCH emacs-team 06/15] gnu: crm114: Adjust to changes in emacs-build-system Liliana Marie Prikler
2023-10-19 5:09 ` [bug#66624] [PATCH emacs-team 07/15] gnu: guile-wisp: Build autoloads before installing them Liliana Marie Prikler
2023-10-19 5:16 ` [bug#66624] [PATCH emacs-team 08/15] gnu: uim: Keep Emacs files in subdirectory Liliana Marie Prikler
2023-10-19 5:20 ` [bug#66624] [PATCH emacs-team 10/15] gnu: emacs-geiser-gauche: Process autoloads in-tree Liliana Marie Prikler
2023-10-19 5:20 ` [bug#66624] [PATCH emacs-team 11/15] gnu: emacs-geiser-racket: " Liliana Marie Prikler
2023-10-19 5:21 ` [bug#66624] [PATCH emacs-team 12/15] gnu: emacs-geiser-chez: " Liliana Marie Prikler
2023-10-19 5:28 ` [bug#66624] [PATCH emacs-team 13/15] gnu: emacs-libgit: Adjust to changes in emacs-build-system Liliana Marie Prikler
2023-10-19 5:31 ` [bug#66624] [PATCH emacs-team 14/15] gnu: emacs-eweouz: Build autoloads before installing them Liliana Marie Prikler
2023-10-19 5:38 ` [bug#66624] [PATCH emacs-team 15/15] gnu: emacs-pdf-tools: " Liliana Marie Prikler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2d1de384f6a5c83c74e46ea090409952dc1c59c5.1697694142.git.liliana.prikler@gmail.com \
--to=liliana.prikler@gmail.com \
--cc=66624@debbugs.gnu.org \
--cc=andrew@trop.in \
--cc=cox.katherine.e+guix@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.