Merge pull request #87754 from ysengrimm/mu4e-update

mu: 1.4.3 -> 1.4.5
This commit is contained in:
Dmitry Kalinkin 2020-05-14 11:18:20 -04:00 committed by GitHub
commit cbdbafd98f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mu"; pname = "mu";
version = "1.4.3"; version = "1.4.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "djcb"; owner = "djcb";
repo = "mu"; repo = "mu";
rev = version; rev = version;
sha256 = "1i9chd8ks1q4g5pyscsir6pw4kahkx3k8ckzbi8j3gr6jz1qzzsg"; sha256 = "18y672cqaicp30zymxr88spmzcn0x7rcv14nbdmd8hzp52rscpj7";
}; };
postPatch = stdenv.lib.optionalString (batchSize != null) '' postPatch = stdenv.lib.optionalString (batchSize != null) ''
@ -21,8 +21,11 @@ stdenv.mkDerivation rec {
''; '';
buildInputs = [ buildInputs = [
sqlite xapian glib gmime3 texinfo emacs guile libsoup icu sqlite xapian glib gmime3 texinfo emacs libsoup icu
] ++ stdenv.lib.optionals withMug [ gtk3 webkitgtk ]; ]
# Workaround for https://github.com/djcb/mu/issues/1641
++ stdenv.lib.optional (!stdenv.isDarwin) guile
++ stdenv.lib.optionals withMug [ gtk3 webkitgtk ];
nativeBuildInputs = [ pkgconfig autoreconfHook pmccabe ]; nativeBuildInputs = [ pkgconfig autoreconfHook pmccabe ];