09/13: gnu: mail: Add 'bash' input for 'wrap-program'.

[guix-commits]

apteryx pushed a commit to branch core-updates
in repository guix.

commit 524749e1a39277b54fb7eec01c2daf6fdb0a1e13
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Fri Jul 2 12:06:21 2021 +0200

    gnu: mail: Add 'bash' input for 'wrap-program'.
    
    It is required for cross-compilation.
    
    * gnu/packages/mail.scm
    (astroid)[inputs]: Add 'bash-minimal'.
    (notifymuch)[inputs]: Likewise.
    (dkimproxy)[inputs]: Likewise.
    (swaks): Delete trailing #t.
    [inputs]: Add 'bash-minimal'.
    (mumi)[inputs]: Likewise.
    (public-inbox)[inputs]: Likewise.
    
    Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
    Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
    Change-Id: I0ebdd60a5b33725548850d53676d181e10c71103
---
 gnu/packages/mail.scm | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index ec5750c7e2..f2a8615dd9 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -959,7 +959,8 @@ mailpack.  What can alterMIME do?
            w3m
            xorg-server-for-tests))
     (inputs
-     (list boost
+     (list bash-minimal
+           boost
            gmime
            gobject-introspection        ; it is referenced
            gtkmm-3
@@ -1333,7 +1334,7 @@ Notmuch.")
          (file-name (string-append name "-" version "-checkout"))))
       (build-system python-build-system)
       (inputs
-       (list python-notmuch python-pygobject gobject-introspection
+       (list bash-minimal python-notmuch python-pygobject gobject-introspection
              libnotify gtk+))
       (arguments
        `(#:phases
@@ -2786,7 +2787,8 @@ DKIM and/or DomainKeys.")
                               "perl-net-dns"
                               "perl-timedate"))))))))
     (inputs
-     (list perl
+     (list bash-minimal
+           perl
            perl-crypt-openssl-rsa
            perl-cryptx
            perl-io-socket-inet6
@@ -3743,7 +3745,11 @@ on the fly.  Both programs are written in C and are very 
fast.")
         (base32 "131i2b1yxhnbqkfk4kky40pfanqw2c5lcgbnjhfqp5cvpawpk2ai"))))
     (build-system perl-build-system)
     (inputs
-     (list perl-io-socket-inet6 perl-net-dns perl-net-ssleay perl-socket6)) ; 
used by perl-io-socket-inet6
+     (list bash-minimal
+           perl-io-socket-inet6
+           perl-net-dns
+           perl-net-ssleay
+           perl-socket6)) ; used by perl-io-socket-inet6
     (arguments
      `(#:tests? #f                      ; no tests
        #:phases
@@ -3751,8 +3757,7 @@ on the fly.  Both programs are written in C and are very 
fast.")
          (add-after 'unpack 'set-build_version
            (lambda _
              (substitute* "swaks"
-               (("\"DEVRELEASE\"") (format #f "\"~a\"" ,version)))
-             #true))
+               (("\"DEVRELEASE\"") (format #f "\"~a\"" ,version)))))
          (delete 'configure)
          (replace 'build
            (lambda _
@@ -3761,14 +3766,12 @@ on the fly.  Both programs are written in C and are 
very fast.")
            (lambda* (#:key outputs #:allow-other-keys)
              (let ((out (assoc-ref outputs "out")))
                (install-file "swaks" (string-append out "/bin"))
-               (install-file "swaks.1" (string-append out "/share/man/man1")))
-             #t))
+               (install-file "swaks.1" (string-append out 
"/share/man/man1")))))
          (add-after 'install 'wrap-program
            (lambda* (#:key outputs #:allow-other-keys)
              (wrap-program (string-append (assoc-ref outputs "out")
                                           "/bin/swaks")
-               `("PERL5LIB" ":" = (,(getenv "PERL5LIB"))))
-             #t)))))
+               `("PERL5LIB" ":" = (,(getenv "PERL5LIB")))))))))
     (home-page "https://jetmore.org/john/code/swaks/";)
     (synopsis "Featureful SMTP test tool")
     (description "Swaks is a flexible, scriptable, transaction-oriented SMTP