From 6fc7c5b40115b060bd5037b70c5df878b15c2865 Mon Sep 17 00:00:00 2001 From: ysengrimm Date: Wed, 13 May 2020 20:21:21 +0200 Subject: [PATCH 1/2] mu: 1.4.3 -> 1.4.5 --- pkgs/tools/networking/mu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index 611e848b9af..4cd5318acf5 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "mu"; - version = "1.4.3"; + version = "1.4.5"; src = fetchFromGitHub { owner = "djcb"; repo = "mu"; rev = version; - sha256 = "1i9chd8ks1q4g5pyscsir6pw4kahkx3k8ckzbi8j3gr6jz1qzzsg"; + sha256 = "18y672cqaicp30zymxr88spmzcn0x7rcv14nbdmd8hzp52rscpj7"; }; postPatch = stdenv.lib.optionalString (batchSize != null) '' From 150a18f9b93fc9c509d9b5e7ab24c5ce95cff802 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 14 May 2020 00:30:31 -0400 Subject: [PATCH 2/2] mu: fix on darwin --- pkgs/tools/networking/mu/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index 4cd5318acf5..98dec71f456 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -21,8 +21,11 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - sqlite xapian glib gmime3 texinfo emacs guile libsoup icu - ] ++ stdenv.lib.optionals withMug [ gtk3 webkitgtk ]; + sqlite xapian glib gmime3 texinfo emacs libsoup icu + ] + # 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 ];