]> git.elephly.net Git - software/mumi.git/commitdiff
guix: Use mumimu instead of mu.
authorRicardo Wurmus <rekado@elephly.net>
Tue, 23 Jul 2019 11:17:40 +0000 (13:17 +0200)
committerRicardo Wurmus <rekado@elephly.net>
Tue, 23 Jul 2019 11:17:40 +0000 (13:17 +0200)
* guix.scm (mumimu): New variable.
* configure.ac: Check for mumimu.
* mumi/config.scm.in (%config): Update placeholder for mu-executable.

configure.ac
guix.scm
mumi/config.scm.in

index 8b66861b8cc82a7f8bffdcbb7529fcf2024aa109..a9ea6b2c5ac278913533fd445805f66a1c7bccaa 100644 (file)
@@ -31,7 +31,7 @@ if test "x$have_fibers" != "xyes"; then
   AC_MSG_ERROR([Guile fibers is missing; please install it.])
 fi
 
-AC_PATH_PROG([MU], [mu])
+AC_PATH_PROG([MUMIMU], [mumimu])
 
 guilemoduledir="${datarootdir}/guile/site/${GUILE_EFFECTIVE_VERSION}"
 AC_SUBST([guilemoduledir])
index 67988043b04c5402a16c0892c1201bbae1dd501a..1cd597cf9dbf27fd3e60f0a5d29a88497b221786 100644 (file)
--- a/guix.scm
+++ b/guix.scm
@@ -29,6 +29,8 @@
              (guix build-system gnu)
              (gnu packages)
              (gnu packages autotools)
+             (gnu packages base)
+             (gnu packages glib)
              (gnu packages guile)
              (gnu packages guile-xyz)
              (gnu packages mail)
       (inputs
        `(("guile" ,guile-2.2))))))
 
+(define-public mumimu
+  (let ((commit "b3fa5648053dae5de2d60a140d2a53ef458f4d0f")
+        (revision "1"))
+    (package (inherit mu)
+      (name "mumimu")
+      (version (git-version (package-version guile-email) revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://git.elephly.net/software/mumimu.git")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "1mjwhx3sk3mrhfw179w1zjgl0bk43zf79j0an401ldj7rw1zlhql"))))
+      (arguments
+       (substitute-keyword-arguments (package-arguments mu)
+         ((#:tests? anything '())
+          #f)
+         ((#:phases phases)
+          `(modify-phases ,phases
+             (replace 'patch-configure
+               (lambda _
+                 (delete-file "autogen.sh")
+                 (substitute* "configure.ac"
+                   ;; Use latest Guile
+                   (("guile-2.0") "guile-2.2"))
+                 (substitute* '("guile/Makefile.am"
+                                "guile/mu/Makefile.am")
+                   (("share/guile/site/2.0/") "share/guile/site/2.2/"))
+                 #t))
+             (replace 'fix-ffi
+               (lambda* (#:key outputs #:allow-other-keys)
+                 (substitute* "guile/mumimu.scm"
+                   (("\"libguile-mu\"")
+                    (format #f "\"~a/lib/libguile-mumimu\""
+                            (assoc-ref outputs "out"))))
+                 #t))
+             (delete 'install-emacs-autoloads)))
+         ((#:configure-flags flags)
+          '("--disable-gtk"
+            "--disable-webkit"
+            "--disable-mu4e"))))
+      (native-inputs
+       `(("pkg-config" ,pkg-config)
+         ("autoconf" ,autoconf)
+         ("automake" ,automake)
+         ("libtool" ,libtool)
+         ("glib" ,glib "bin")
+         ("tzdata" ,tzdata-for-tests)
+         ("texinfo" ,texinfo))))))
+
 (package
   (name "mumi")
   (version "0.0.0")
      ("guile-fibers" ,guile-fibers)
      ("guile-syntax-highlight" ,guile-syntax-highlight)
      ("guile" ,guile-2.2)
-     ("mu" ,mu)))
+     ("mumimu" ,mumimu)))
   (native-inputs
    `(("autoconf" ,autoconf)
      ("automake" ,automake)
index 9d8a9c3ff06a7364bfb4a10446cc20e544694ea6..a7500a047029fd7ce76b4326cbd5349f1df658c9 100644 (file)
@@ -46,7 +46,7 @@
            (submission-bug-email-address . "bug-guix@gnu.org")
            (lists       . ("guix-patches@gnu.org" "bug-guix@gnu.org"))
            (packages    . ("guix-patches" "guix"))
-           (mu-executable . "@MU@")
+           (mu-executable . "@MUMIMU@")
            (debbugs     . ,%gnu)
            (debbugs-domain . "debbugs.gnu.org"))))
     (lambda (key)