mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-11-17 12:17:10 -05:00
gnu: notmuch: Use G-expressions.
* gnu/packages/mail.scm (notmuch)[arguments]: Use G-expressions. <#:phases>: Use SEARCH-INPUT-FILES instead of WHICH.
This commit is contained in:
parent
fb3508bb36
commit
d7368fe7f2
1 changed files with 20 additions and 18 deletions
|
@ -1345,24 +1345,26 @@ (define-public notmuch
|
||||||
(base32 "0fdc81m24xrbhfrhw00g12ak4b8hap4961sq7ap6q2pjqhac8cd8"))))
|
(base32 "0fdc81m24xrbhfrhw00g12ak4b8hap4961sq7ap6q2pjqhac8cd8"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:make-flags
|
(list
|
||||||
(list "V=1" ; verbose test output
|
#:make-flags
|
||||||
"NOTMUCH_TEST_TIMEOUT=1h") ; don't fail on slow machines
|
#~(list "V=1" ; verbose test output
|
||||||
#:phases (modify-phases %standard-phases
|
"NOTMUCH_TEST_TIMEOUT=1h") ; don't fail on slow machines
|
||||||
(replace 'configure
|
#:phases
|
||||||
(lambda* (#:key outputs #:allow-other-keys)
|
#~(modify-phases %standard-phases
|
||||||
(setenv "CC" ,(cc-for-target))
|
(replace 'configure
|
||||||
(setenv "CONFIG_SHELL" (which "sh"))
|
(lambda* (#:key inputs #:allow-other-keys)
|
||||||
(let* ((out (assoc-ref outputs "out")))
|
(setenv "CC" #$(cc-for-target))
|
||||||
(invoke "./configure"
|
(setenv "CONFIG_SHELL" (search-input-file inputs "/bin/sh"))
|
||||||
(string-append "--prefix=" out)
|
(invoke "./configure"
|
||||||
"--without-emacs"))))
|
(string-append "--prefix=" #$output)
|
||||||
(add-before 'check 'prepare-test-environment
|
"--without-emacs")))
|
||||||
(lambda _
|
(add-before 'check 'prepare-test-environment
|
||||||
(setenv "TEST_CC" ,(cc-for-target))
|
(lambda* (#:key inputs #:allow-other-keys)
|
||||||
;; Patch various inline shell invocations.
|
(setenv "TEST_CC" #$(cc-for-target))
|
||||||
(substitute* (find-files "test" "\\.sh$")
|
;; Patch various inline shell invocations.
|
||||||
(("/bin/sh") (which "sh"))))))))
|
(let ((sh (search-input-file inputs "/bin/sh")))
|
||||||
|
(substitute* (find-files "test" "\\.sh$")
|
||||||
|
(("/bin/sh") sh))))))))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
(list bash-completion
|
(list bash-completion
|
||||||
pkg-config
|
pkg-config
|
||||||
|
|
Loading…
Reference in a new issue