diff options
Diffstat (limited to 'gnu/packages/mail.scm')
| -rw-r--r-- | gnu/packages/mail.scm | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 523e6cdce3..23a8710b9b 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -40,6 +40,7 @@ ;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com> ;;; Copyright © 2020 B. Wilson <elaexuotee@wilsonb.com> ;;; Copyright © 2020 divoplade <d@divoplade.fr> +;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz> ;;; Copyright © 2021 Benoit Joly <benoit@benoitj.ca> ;;; @@ -924,7 +925,7 @@ mailpack. What can alterMIME do? `(("boost" ,boost) ("gmime" ,gmime) ("gobject-introspection" ,gobject-introspection) ; it is referenced - ("gtkmm" ,gtkmm) + ("gtkmm" ,gtkmm-3) ("libpeas" ,libpeas) ("libsass" ,libsass) ("notmuch" ,notmuch) @@ -1222,8 +1223,7 @@ security functionality including PGP, S/MIME, SSH, and SSL.") (lambda* (#:key inputs #:allow-other-keys) ;; For mu/test/test-mu-query.c (setenv "TZDIR" - (string-append (assoc-ref inputs "tzdata") - "/share/zoneinfo")))) + (search-input-directory inputs "share/zoneinfo")))) (add-after 'install 'install-emacs-autoloads (lambda* (#:key outputs #:allow-other-keys) (emacs-generate-autoloads @@ -1329,7 +1329,7 @@ Notmuch.") (let* ((out (assoc-ref outputs "out")) (bin (string-append out "/bin/notifymuch"))) (wrap-program bin - `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH"))) + `("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH"))) `("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH") ,(string-append out "/lib/girepository-1.0"))))) @@ -1667,8 +1667,8 @@ compresses it.") (lambda* (#:key inputs #:allow-other-keys) (substitute* "src/procmime.c" (("/usr/share/mime/globs") - (string-append (assoc-ref inputs "shared-mime-info") - "/share/mime/globs")))))))) + (search-input-directory inputs + "/share/mime/globs")))))))) (native-inputs `(("bison" ,bison) ;;("docbook-utils" ,docbook-utils) @@ -1914,11 +1914,7 @@ facilities for checking incoming mail.") ("icu4c" ,icu4c) ("libsodium" ,libsodium) ; extra password algorithms ("libstemmer" ,libstemmer) - ;; FIXME: The 'test-backtrace' tests fail on arm when using glibc's - ;; backtrace_symbol() function so fallback to using libunwind. - ,@(if (target-arm?) - `(("libunwind" ,libunwind)) - '()) + ("libunwind" ,libunwind) ("linux-pam" ,linux-pam) ("lz4" ,lz4) ("openssl" ,openssl) @@ -3008,6 +3004,7 @@ transfer protocols.") (let ((out (assoc-ref outputs "out")) (path (getenv "PERL5LIB"))) (wrap-script (string-append out "/bin/sieve-connect") + #:guile (search-input-file inputs "bin/guile") `("PERL5LIB" ":" = (,path))) #t)))))) (inputs @@ -3542,7 +3539,6 @@ which sends emails to HyperKitty, the official Mailman3 web archiver.") (modify-phases %standard-phases (replace 'check (lambda _ - (setenv "PYTHONPATH" (string-append ".:" (getenv "PYTHONPATH"))) (invoke "example_project/manage.py" "test" "--settings=hyperkitty.tests.settings_test")))))) (propagated-inputs @@ -4175,7 +4171,7 @@ Git and exports them in maildir format or to an MDA through a pipe.") ;; 'git' is invoked in various files of the PublicInbox ;; perl module. `("PATH" ":" prefix - (,(string-append (assoc-ref inputs "git") "/bin"))))) + (,(dirname (search-input-file inputs "/bin/git")))))) (find-files (string-append out "/bin")))) #t))))) (native-inputs |