diff mbox series

[bug#71390] gnu: mu: Update to 1.12.5.

Message ID 4c4eb04bbb532849833d331cf014f8fce052448b.1717658545.git.sarg@sarg.org.ru
State New
Headers show
Series [bug#71390] gnu: mu: Update to 1.12.5. | expand

Commit Message

Sergey Trofimov June 6, 2024, 7:22 a.m. UTC 
* gnu/packages/mail.scm (mu): Update to 1.12.5.  Wrap /bin/mu to enable
running Guile extension scripts.
---
 gnu/packages/mail.scm | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)


base-commit: 2b2337f275a6421a0d0964c54987df4ac74162e6
--
2.45.1

Comments

Christopher Baines June 11, 2024, 11:43 a.m. UTC | #1 
Sergey Trofimov <sarg@sarg.org.ru> writes:

> * gnu/packages/mail.scm (mu): Update to 1.12.5.  Wrap /bin/mu to enable
> running Guile extension scripts.
> ---
>  gnu/packages/mail.scm | 20 +++++++++++++++-----
>  1 file changed, 15 insertions(+), 5 deletions(-)

Looks good to me, I've pushed this to master as
cc2c6049723f936ba394f5eeed331f980ea296f1.

Chris
diff mbox series

Patch

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index b96645f53b..dbf27d3533 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -1260,14 +1260,14 @@  (define-public emacs-mew
 (define-public mu
   (package
     (name "mu")
-    (version "1.12.4")
+    (version "1.12.5")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://github.com/djcb/mu/releases/download/v"
                            version "/mu-" version ".tar.xz"))
        (sha256
-        (base32 "1ja4b9r9712zjvz8223r5vh2kmmyhkrmb7cbhxdn9hbpa5n16hdx"))))
+        (base32 "1jwalqmvk5s4mf7bnz7gnzh6rii7n348bsflgdvyinia0zir42vp"))))
     (build-system meson-build-system)
     (native-inputs
      (list pkg-config
@@ -1280,8 +1280,11 @@  (define-public mu
      (list
       #:modules '((guix build meson-build-system)
                   (guix build emacs-utils)
+                  ((guix build guile-build-system)
+                   #:select (target-guile-effective-version))
                   (guix build utils))
       #:imported-modules `(,@%meson-build-system-modules
+                           (guix build guile-build-system)
                            (guix build emacs-utils))
       #:configure-flags
       #~(list (format #f "-Dguile-extension-dir=~a/lib" #$output))
@@ -1303,11 +1306,18 @@  (define-public mu
                 (("\"libguile-mu\"")
                  (format #f "\"~a/lib/libguile-mu\"" #$output)))))
           (add-after 'install 'install-emacs-autoloads
-            (lambda* (#:key outputs #:allow-other-keys)
+            (lambda _
               (emacs-generate-autoloads
                "mu4e"
-               (string-append (assoc-ref outputs "out")
-                              "/share/emacs/site-lisp/mu4e")))))))
+               (string-append #$output
+                              "/share/emacs/site-lisp/mu4e"))))
+          (add-after 'install 'wrap-executable
+            (lambda _
+              (let* ((bin (string-append #$output "/bin"))
+                     (version (target-guile-effective-version))
+                     (scm (string-append #$output "/share/guile/site/" version)))
+                (wrap-program (string-append bin "/mu")
+                  `("GUILE_LOAD_PATH" ":" prefix (,scm)))))))))
     (home-page "https://www.djcbsoftware.nl/code/mu/")
     (synopsis "Quickly find emails")
     (description