Skip to content

Commit 46c9517

Browse files
authored
mmh: unstable-2020-08-21 -> unstable-2023-09-24, unbreak on GCC 14 (NixOS#392145)
2 parents c444dfa + 4510e2a commit 46c9517

File tree

1 file changed

+14
-8
lines changed

1 file changed

+14
-8
lines changed

pkgs/by-name/mm/mmh/package.nix

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,21 @@
77
flex,
88
}:
99
let
10-
rev = "b17ea39dc17e5514f33b3f5c34ede92bd16e208c";
10+
rev = "7e93dee44df1a7e8f551a2e408a600b2e90a0974";
1111
in
1212
stdenv.mkDerivation {
1313
pname = "mmh";
14-
version = "unstable-2020-08-21";
14+
version = "unstable-2023-09-24";
1515

1616
src = fetchurl {
1717
url = "http://git.marmaro.de/?p=mmh;a=snapshot;h=${rev};sf=tgz";
1818
name = "mmh-${rev}.tgz";
19-
sha256 = "1bqfxafw4l2y46pnsxgy4ji1xlyifzw01k1ykbsjj9p61q3nv6l6";
19+
hash = "sha256-t2Qnwtkli+/MDk6uaikS2SIP9LucK64os8kGcn2ytRU=";
2020
};
2121

2222
postPatch = ''
2323
substituteInPlace sbr/Makefile.in \
24-
--replace "ar " "${stdenv.cc.targetPrefix}ar "
24+
--replace-fail "ar " "${stdenv.cc.targetPrefix}ar "
2525
'';
2626

2727
buildInputs = [ ncurses ];
@@ -30,12 +30,18 @@ stdenv.mkDerivation {
3030
flex
3131
];
3232

33-
meta = with lib; {
33+
# mhl.c:1031:58: error: pointer type mismatch in conditional expression []
34+
# 1031 | putstr((c1->c_flags & RTRIM) ? rtrim(cp) : cp);
35+
NIX_CFLAGS_COMPILE = [ " -Wno-error=incompatible-pointer-types" ];
36+
37+
enableParallelBuilding = true;
38+
39+
meta = {
3440
description = "Set of electronic mail handling programs";
3541
homepage = "http://marmaro.de/prog/mmh";
36-
license = licenses.bsd3;
37-
platforms = platforms.unix;
42+
license = lib.licenses.bsd3;
43+
platforms = lib.platforms.unix;
3844
broken = stdenv.hostPlatform.isDarwin;
39-
maintainers = with maintainers; [ kaction ];
45+
maintainers = with lib.maintainers; [ kaction ];
4046
};
4147
}

0 commit comments

Comments
 (0)