mu: 1.6.11 -> 1.8.0

https://github.com/djcb/mu/blob/release/1.8/NEWS.org

Also includes some cleanup of the dependencies. Guile support was deprecated, so
that is removed as well.
This commit is contained in:
Charlotte Van Petegem 2022-06-25 16:31:08 +02:00
parent 0100c5e564
commit 6b29acef6e
No known key found for this signature in database
GPG Key ID: 019E764B7184435A

View File

@ -1,61 +1,54 @@
{ lib, stdenv, fetchFromGitHub, sqlite, pkg-config, autoreconfHook, pmccabe
, xapian, glib, gmime3, texinfo, emacs, guile
, gtk3, webkitgtk, libsoup, icu
, makeWrapper
, withMug ? false
, batchSize ? null }:
{ lib
, stdenv
, fetchFromGitHub
, meson
, ninja
, pkg-config
, coreutils
, emacs
, glib
, gmime3
, texinfo
, xapian
}:
stdenv.mkDerivation rec {
pname = "mu";
version = "1.6.11";
version = "1.8.0";
src = fetchFromGitHub {
owner = "djcb";
repo = "mu";
rev = version;
sha256 = "E/6+vEwYXk65/ZoAtUeTjvg56g6gz+Qtcaz0qwEru6c=";
rev = "v${version}";
sha256 = "rb8R04eU/rG7PXx/horYk0+/3AgbxYYZtxy4ACILOZ8=";
};
postPatch = lib.optionalString (batchSize != null) ''
sed -i lib/mu-store.cc --regexp-extended \
-e 's@(constexpr auto BatchSize).*@\1 = ${toString batchSize};@'
'';
postPatch = ''
# Fix mu4e-builddir (set it to $out)
substituteInPlace mu4e/mu4e-config.el.in \
--replace "@abs_top_builddir@" "$out"
substituteInPlace lib/utils/mu-utils.cc \
--replace "/bin/rm" "${coreutils}/bin/rm"
'';
buildInputs = [
sqlite xapian glib gmime3 texinfo emacs libsoup icu
]
# Workaround for https://github.com/djcb/mu/issues/1641
++ lib.optional (!stdenv.isDarwin) guile
++ lib.optionals withMug [ gtk3 webkitgtk ];
buildInputs = [ emacs glib gmime3 texinfo xapian ];
nativeBuildInputs = [ pkg-config autoreconfHook pmccabe makeWrapper ];
mesonFlags = [
"-Dguile=disabled"
"-Dreadline=disabled"
];
nativeBuildInputs = [ pkg-config meson ninja ];
enableParallelBuilding = true;
preBuild = ''
# Fix mu4e-builddir (set it to $out)
substituteInPlace mu4e/mu4e-meta.el.in \
--replace "@abs_top_builddir@" "$out"
'';
# Make sure included scripts can find their dependencies & optionally install mug
postInstall = ''
wrapProgram "$out/bin/mu" \
--prefix LD_LIBRARY_PATH : "$out/lib" \
--prefix GUILE_LOAD_PATH : "$out/share/guile/site/2.2"
'' + lib.optionalString withMug ''
for f in mug ; do
install -m755 toys/$f/$f $out/bin/$f
done
'';
doCheck = true;
meta = with lib; {
description = "A collection of utilties for indexing and searching Maildirs";
license = licenses.gpl3Plus;
homepage = "https://www.djcbsoftware.nl/code/mu/";
changelog = "https://github.com/djcb/mu/releases/tag/${version}";
changelog = "https://github.com/djcb/mu/releases/tag/v${version}";
maintainers = with maintainers; [ antono chvp peterhoeg ];
platforms = platforms.mesaPlatforms;
};