mu: 1.2 -> 1.4.1

msg2pdf is disabled for now:
https://github.com/djcb/mu/blob/1.4.1/NEWS.org
This commit is contained in:
Bart Brouns 2020-04-20 10:57:40 +02:00
parent d79c2dd4d4
commit ed79cb56b7
1 changed files with 6 additions and 13 deletions

View File

@ -5,20 +5,15 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mu"; pname = "mu";
version = "1.2"; version = "1.4.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "djcb"; owner = "djcb";
repo = "mu"; repo = "mu";
rev = version; rev = version;
sha256 = "0yhjlj0z23jw3cf2wfnl98y8q6gikvmhkb8vdm87bd7jw0bdnrfz"; sha256 = "0q2ik7fj5k9i76js4ijyxbgrwqff437lass0sd5if2r40rqh0as0";
}; };
# test-utils coredumps so don't run those
postPatch = ''
sed -i -e '/test-utils/d' lib/parser/Makefile.am
'';
buildInputs = [ buildInputs = [
sqlite xapian glib gmime3 texinfo emacs guile libsoup icu sqlite xapian glib gmime3 texinfo emacs guile libsoup icu
] ++ stdenv.lib.optionals withMug [ gtk3 webkitgtk ]; ] ++ stdenv.lib.optionals withMug [ gtk3 webkitgtk ];
@ -27,19 +22,17 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
preConfigure = "./autogen.sh";
preBuild = '' preBuild = ''
# Fix mu4e-builddir (set it to $out) # Fix mu4e-builddir (set it to $out)
substituteInPlace mu4e/mu4e-meta.el.in \ substituteInPlace mu4e/mu4e-meta.el.in \
--replace "@abs_top_builddir@" "$out" --replace "@abs_top_builddir@" "$out"
# We install msg2pdf to bin/msg2pdf, fix its location in elisp
substituteInPlace mu4e/mu4e-actions.el \
--replace "/toys/msg2pdf/" "/bin/"
''; '';
# Install mug and msg2pdf # Install mug
postInstall = stdenv.lib.optionalString withMug '' postInstall = stdenv.lib.optionalString withMug ''
for f in msg2pdf mug ; do for f in mug ; do
install -m755 toys/$f/$f $out/bin/$f install -m755 toys/$f/$f $out/bin/$f
done done
''; '';