nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: mu: Avoid bootstrapping. 

* gnu/packages/mail.scm (mu)[arguments]: Rename "patch-configure.ac" to
"patch-configure" and only patch "configure" script; remove "autoreconf"
phase.
[native-inputs]: Remove "autoconf", "automake", "libtool", and
"texinfo".
This commit is contained in:
Ricardo Wurmus 2016-12-29 09:20:08 +01:00
parent e7b9da2411
commit e62e975b1f
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gnu/packages/mail.scm
View File

@ -393,11 +393,7 @@ repository and Maildir/IMAP as LOCAL repository.")
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
("glib" ,glib "bin") ; for gtester ("glib" ,glib "bin") ; for gtester
("autoconf" ,autoconf) ("emacs" ,emacs-minimal)))
("automake" ,automake)
("emacs" ,emacs-minimal)
("libtool" ,libtool)
("texinfo" ,texinfo)))
;; TODO: Add webkit and gtk to build the mug GUI. ;; TODO: Add webkit and gtk to build the mug GUI.
(inputs (inputs
`(("xapian" ,xapian) `(("xapian" ,xapian)
@ -413,18 +409,15 @@ repository and Maildir/IMAP as LOCAL repository.")
(guix build emacs-utils)) (guix build emacs-utils))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'patch-configure.ac (add-after 'unpack 'patch-configure
;; By default, elisp code goes to "share/emacs/site-lisp/mu4e", ;; By default, elisp code goes to "share/emacs/site-lisp/mu4e",
;; so our Emacs package can't find it. Setting "--with-lispdir" ;; so our Emacs package can't find it. Setting "--with-lispdir"
;; configure flag doesn't help because "mu4e" will be added to ;; configure flag doesn't help because "mu4e" will be added to
;; the lispdir anyway, so we have to modify "configure.ac". ;; the lispdir anyway, so we have to modify "configure.ac".
(lambda _ (lambda _
(substitute* "configure.ac" (substitute* "configure"
(("^ +lispdir=.*") "")) (("^ +lispdir=\"\\$\\{lispdir\\}/mu4e/\".*") ""))
#t)) #t))
(add-after 'patch-configure.ac 'autoreconf
(lambda _
(zero? (system* "autoreconf" "-vi"))))
(add-before 'check 'check-tz-setup (add-before 'check 'check-tz-setup
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; For mu/test/test-mu-query.c ;; For mu/test/test-mu-query.c