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
This commit is contained in:
Maxime Devos 2021-07-02 12:06:21 +02:00 committed by Ludovic Courtès
parent 53e466ad5f
commit 632834696b
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5

View file

@ -1012,7 +1012,8 @@ (define-public astroid
w3m w3m
xorg-server-for-tests)) xorg-server-for-tests))
(inputs (inputs
(list boost (list bash-minimal
boost
gmime gmime
gobject-introspection ; it is referenced gobject-introspection ; it is referenced
gtkmm-3 gtkmm-3
@ -1409,7 +1410,7 @@ (define-public notifymuch
(file-name (string-append name "-" version "-checkout")))) (file-name (string-append name "-" version "-checkout"))))
(build-system python-build-system) (build-system python-build-system)
(inputs (inputs
(list python-notmuch python-pygobject gobject-introspection (list bash-minimal python-notmuch python-pygobject gobject-introspection
libnotify gtk+)) libnotify gtk+))
(arguments (arguments
`(#:phases `(#:phases
@ -2892,7 +2893,8 @@ (define-public dkimproxy
"perl-net-dns" "perl-net-dns"
"perl-timedate")))))))) "perl-timedate"))))))))
(inputs (inputs
(list perl (list bash-minimal
perl
perl-crypt-openssl-rsa perl-crypt-openssl-rsa
perl-cryptx perl-cryptx
perl-io-socket-inet6 perl-io-socket-inet6
@ -3868,7 +3870,11 @@ (define-public swaks
(base32 "131i2b1yxhnbqkfk4kky40pfanqw2c5lcgbnjhfqp5cvpawpk2ai")))) (base32 "131i2b1yxhnbqkfk4kky40pfanqw2c5lcgbnjhfqp5cvpawpk2ai"))))
(build-system perl-build-system) (build-system perl-build-system)
(inputs (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 (arguments
`(#:tests? #f ; no tests `(#:tests? #f ; no tests
#:phases #:phases
@ -3876,8 +3882,7 @@ (define-public swaks
(add-after 'unpack 'set-build_version (add-after 'unpack 'set-build_version
(lambda _ (lambda _
(substitute* "swaks" (substitute* "swaks"
(("\"DEVRELEASE\"") (format #f "\"~a\"" ,version))) (("\"DEVRELEASE\"") (format #f "\"~a\"" ,version)))))
#true))
(delete 'configure) (delete 'configure)
(replace 'build (replace 'build
(lambda _ (lambda _
@ -3886,14 +3891,12 @@ (define-public swaks
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(install-file "swaks" (string-append out "/bin")) (install-file "swaks" (string-append out "/bin"))
(install-file "swaks.1" (string-append out "/share/man/man1"))) (install-file "swaks.1" (string-append out "/share/man/man1")))))
#t))
(add-after 'install 'wrap-program (add-after 'install 'wrap-program
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(wrap-program (string-append (assoc-ref outputs "out") (wrap-program (string-append (assoc-ref outputs "out")
"/bin/swaks") "/bin/swaks")
`("PERL5LIB" ":" = (,(getenv "PERL5LIB")))) `("PERL5LIB" ":" = (,(getenv "PERL5LIB")))))))))
#t)))))
(home-page "https://jetmore.org/john/code/swaks/") (home-page "https://jetmore.org/john/code/swaks/")
(synopsis "Featureful SMTP test tool") (synopsis "Featureful SMTP test tool")
(description "Swaks is a flexible, scriptable, transaction-oriented SMTP (description "Swaks is a flexible, scriptable, transaction-oriented SMTP