[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#57013] Acknowledgement ([PATCH] Fix mu4e in mu 1.8.7.)
From: |
Zhu Zihao |
Subject: |
[bug#57013] Acknowledgement ([PATCH] Fix mu4e in mu 1.8.7.) |
Date: |
Fri, 19 Aug 2022 13:35:34 +0800 |
User-agent: |
mu4e 1.8.8; emacs 29.0.50 |
Rebase on master.
>From f5b3a6e3ae7b6ca5d84f3f6a01459bdea40bb4cf Mon Sep 17 00:00:00 2001
From: Zhu Zihao <all_but_last@163.com>
Date: Sat, 6 Aug 2022 00:08:37 +0800
Subject: [PATCH 1/2] gnu: mu: Fix autoloads generation.
* gnu/packages/mail.scm (mu)[arguments]<#:phases>: In phase
'install-emacs-autoloads', fix the path to mu4e files to generate autoloads.
---
gnu/packages/mail.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index b4b3162fff..530cd29f4d 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -1201,7 +1201,7 @@ (define-public mu
(emacs-generate-autoloads
"mu4e"
(string-append (assoc-ref outputs "out")
- "/share/emacs/site-lisp")))))))
+ "/share/emacs/site-lisp/mu4e")))))))
(home-page "https://www.djcbsoftware.nl/code/mu/")
(synopsis "Quickly find emails")
(description
--
2.37.1
>From 10c6a67905d784da4173a05c7ea6d331cf8fd88d Mon Sep 17 00:00:00 2001
From: Zhu Zihao <all_but_last@163.com>
Date: Fri, 19 Aug 2022 13:33:20 +0800
Subject: [PATCH 2/2] gnu: mu: Use G-expressions.
* gnu/packages/mail.scm (mu)[arguments]: Use G-expressions.
---
gnu/packages/mail.scm | 41 +++++++++++++++++++++--------------------
1 file changed, 21 insertions(+), 20 deletions(-)
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 530cd29f4d..646902b4db 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -1179,29 +1179,30 @@ (define-public mu
(inputs
(list glib gmime xapian))
(arguments
- `(#:modules ((guix build meson-build-system)
+ (list
+ #:modules '((guix build meson-build-system)
(guix build emacs-utils)
(guix build utils))
- #:imported-modules (,@%meson-build-system-modules
+ #:imported-modules `(,@%meson-build-system-modules
(guix build emacs-utils))
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'patch-bin-references
- (lambda _
- (substitute* '("guile/tests/test-mu-guile.cc"
- "mu/tests/test-mu-cmd.cc"
- "mu/tests/test-mu-cmd-cfind.cc"
- "mu/tests/test-mu-query.cc")
- (("/bin/sh") (which "sh")))
- (substitute* '("lib/tests/bench-indexer.cc"
- "lib/utils/mu-test-utils.cc")
- (("/bin/rm") (which "rm")))))
- (add-after 'install 'install-emacs-autoloads
- (lambda* (#:key outputs #:allow-other-keys)
- (emacs-generate-autoloads
- "mu4e"
- (string-append (assoc-ref outputs "out")
- "/share/emacs/site-lisp/mu4e")))))))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-bin-references
+ (lambda _
+ (substitute* '("guile/tests/test-mu-guile.cc"
+ "mu/tests/test-mu-cmd.cc"
+ "mu/tests/test-mu-cmd-cfind.cc"
+ "mu/tests/test-mu-query.cc")
+ (("/bin/sh") (which "sh")))
+ (substitute* '("lib/tests/bench-indexer.cc"
+ "lib/utils/mu-test-utils.cc")
+ (("/bin/rm") (which "rm")))))
+ (add-after 'install 'install-emacs-autoloads
+ (lambda* (#:key outputs #:allow-other-keys)
+ (emacs-generate-autoloads
+ "mu4e"
+ (string-append (assoc-ref outputs "out")
+ "/share/emacs/site-lisp/mu4e")))))))
(home-page "https://www.djcbsoftware.nl/code/mu/")
(synopsis "Quickly find emails")
(description
--
2.37.1
--
Retrieve my PGP public key:
gpg --recv-keys 481F5EEEBA425ADC13247C76A6E672D981B8E744
Zihao