Skip to content

Commit 4fcb5e4

Browse files
committed
1 parent 41cae5b commit 4fcb5e4

File tree

1 file changed

+14
-9
lines changed

1 file changed

+14
-9
lines changed

pkgs/by-name/mu/mu/package.nix

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
pkg-config,
99
python3,
1010
cld2,
11+
cli11,
12+
fmt_11,
1113
coreutils,
1214
emacs,
1315
glib,
@@ -16,9 +18,9 @@
1618
xapian,
1719
}:
1820

19-
stdenv.mkDerivation rec {
21+
stdenv.mkDerivation (finalAttrs: {
2022
pname = "mu";
21-
version = "1.12.12";
23+
version = "1.12.13";
2224

2325
outputs = [
2426
"out"
@@ -28,8 +30,8 @@ stdenv.mkDerivation rec {
2830
src = fetchFromGitHub {
2931
owner = "djcb";
3032
repo = "mu";
31-
rev = "v${version}";
32-
hash = "sha256-ZdVzyfzTsGn3DaeOEXZFA/wX8MxIeD45FaKYU6okr4Y=";
33+
rev = "v${finalAttrs.version}";
34+
hash = "sha256-rz0bxgJtz4qHrfHRjJhnvxtFFNM89A39YH9oJ2YGC5g=";
3335
};
3436

3537
postPatch = ''
@@ -63,17 +65,20 @@ stdenv.mkDerivation rec {
6365

6466
buildInputs = [
6567
cld2
68+
cli11
6669
emacs
70+
fmt_11
6771
glib
6872
gmime3
6973
texinfo
7074
xapian
7175
];
7276

7377
mesonFlags = [
74-
"-Dguile=disabled"
75-
"-Dreadline=disabled"
76-
"-Dlispdir=${placeholder "mu4e"}/share/emacs/site-lisp"
78+
(lib.strings.mesonEnable "guile" false)
79+
(lib.strings.mesonEnable "readline" false)
80+
(lib.strings.mesonEnable "tests" finalAttrs.doCheck)
81+
(lib.strings.mesonOption "lispdir" "${placeholder "mu4e"}/share/emacs/site-lisp")
7782
];
7883

7984
nativeBuildInputs = [
@@ -93,7 +98,7 @@ stdenv.mkDerivation rec {
9398
description = "Collection of utilities for indexing and searching Maildirs";
9499
license = lib.licenses.gpl3Plus;
95100
homepage = "https://www.djcbsoftware.nl/code/mu/";
96-
changelog = "https://github.com/djcb/mu/releases/tag/v${version}";
101+
changelog = "https://github.com/djcb/mu/releases/tag/v${finalAttrs.version}";
97102
maintainers = with lib.maintainers; [
98103
antono
99104
chvp
@@ -102,4 +107,4 @@ stdenv.mkDerivation rec {
102107
mainProgram = "mu";
103108
platforms = lib.platforms.unix;
104109
};
105-
}
110+
})

0 commit comments

Comments
 (0)