summary refs log tree commit diff
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2017-10-29 00:13:32 +0200
committerRicardo Wurmus <rekado@elephly.net>2017-10-29 18:30:58 +0100
commitd59ec12975d8411d757a5a0aa4a5e23af83d289e (patch)
treec38b28263839564901de0a655d0f3ab6fcc105d4
parent8de54944f7fb48245de3dcc2979056f24ca81744 (diff)
downloadguix-d59ec12975d8411d757a5a0aa4a5e23af83d289e.tar.gz
gnu: mu: Use Guile 2.2.
* gnu/packages/mail.scm (mu)[inputs]: Replace guile-2.0 with guile-2.2.
[arguments]: Replace references to version 2.0.
-rw-r--r--gnu/packages/mail.scm9
1 files changed, 7 insertions, 2 deletions
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index bc962854c8..bac594c815 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -546,7 +546,7 @@ security functionality including PGP, S/MIME, SSH, and SSL.")
     ;; TODO: Add webkit and gtk to build the mug GUI.
     (inputs
      `(("xapian" ,xapian)
-       ("guile" ,guile-2.0)
+       ("guile" ,guile-2.2)
        ("glib" ,glib)
        ("gmime" ,gmime)
        ("tzdata" ,tzdata)))             ;for mu/test/test-mu-query.c
@@ -565,7 +565,12 @@ security functionality including PGP, S/MIME, SSH, and SSL.")
            ;; the lispdir anyway, so we have to modify "configure.ac".
            (lambda _
              (substitute* "configure"
-               (("^ +lispdir=\"\\$\\{lispdir\\}/mu4e/\".*") ""))
+               (("^ +lispdir=\"\\$\\{lispdir\\}/mu4e/\".*") "")
+               ;; Use latest Guile
+               (("guile-2.0") "guile-2.2"))
+             (substitute* '("guile/Makefile.in"
+                            "guile/mu/Makefile.in")
+               (("share/guile/site/2.0/") "share/guile/site/2.2/"))
              #t))
          (add-before 'check 'check-tz-setup
            (lambda* (#:key inputs #:allow-other-keys)