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 @@ invoking @command{notifymuch} from the post-new hook.")
 | 
				
			||||||
        (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
 | 
				
			||||||
 | 
					      #~(list "V=1"                      ; verbose test output
 | 
				
			||||||
              "NOTMUCH_TEST_TIMEOUT=1h") ; don't fail on slow machines
 | 
					              "NOTMUCH_TEST_TIMEOUT=1h") ; don't fail on slow machines
 | 
				
			||||||
       #:phases (modify-phases %standard-phases
 | 
					      #:phases
 | 
				
			||||||
 | 
					      #~(modify-phases %standard-phases
 | 
				
			||||||
          (replace 'configure
 | 
					          (replace 'configure
 | 
				
			||||||
                    (lambda* (#:key outputs #:allow-other-keys)
 | 
					            (lambda* (#:key inputs #:allow-other-keys)
 | 
				
			||||||
                      (setenv "CC" ,(cc-for-target))
 | 
					              (setenv "CC" #$(cc-for-target))
 | 
				
			||||||
                      (setenv "CONFIG_SHELL" (which "sh"))
 | 
					              (setenv "CONFIG_SHELL" (search-input-file inputs "/bin/sh"))
 | 
				
			||||||
                      (let* ((out (assoc-ref outputs "out")))
 | 
					 | 
				
			||||||
              (invoke "./configure"
 | 
					              (invoke "./configure"
 | 
				
			||||||
                                (string-append "--prefix=" out)
 | 
					                      (string-append "--prefix=" #$output)
 | 
				
			||||||
                                "--without-emacs"))))
 | 
					                      "--without-emacs")))
 | 
				
			||||||
          (add-before 'check 'prepare-test-environment
 | 
					          (add-before 'check 'prepare-test-environment
 | 
				
			||||||
                    (lambda _
 | 
					            (lambda* (#:key inputs #:allow-other-keys)
 | 
				
			||||||
                      (setenv "TEST_CC" ,(cc-for-target))
 | 
					              (setenv "TEST_CC" #$(cc-for-target))
 | 
				
			||||||
              ;; Patch various inline shell invocations.
 | 
					              ;; Patch various inline shell invocations.
 | 
				
			||||||
 | 
					              (let ((sh (search-input-file inputs "/bin/sh")))
 | 
				
			||||||
                (substitute* (find-files "test" "\\.sh$")
 | 
					                (substitute* (find-files "test" "\\.sh$")
 | 
				
			||||||
                        (("/bin/sh") (which "sh"))))))))
 | 
					                  (("/bin/sh") sh))))))))
 | 
				
			||||||
    (native-inputs
 | 
					    (native-inputs
 | 
				
			||||||
     (list bash-completion
 | 
					     (list bash-completion
 | 
				
			||||||
           pkg-config
 | 
					           pkg-config
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Reference in a new issue