diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | guix.scm | 56 | ||||
| -rw-r--r-- | mumi/config.scm.in | 2 |
3 files changed, 57 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 8b66861..a9ea6b2 100644 --- a/configure.ac +++ b/configure.ac @@ -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]) @@ -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) @@ -83,6 +85,58 @@ (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") @@ -95,7 +149,7 @@ ("guile-fibers" ,guile-fibers) ("guile-syntax-highlight" ,guile-syntax-highlight) ("guile" ,guile-2.2) - ("mu" ,mu))) + ("mumimu" ,mumimu))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) diff --git a/mumi/config.scm.in b/mumi/config.scm.in index 9d8a9c3..a7500a0 100644 --- a/mumi/config.scm.in +++ b/mumi/config.scm.in @@ -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) |