pyrox.dev
pinfo: fix build for ncurses-6.3
Otherwise on upcoming ncurses-6.3 the build fails as:
video.c:114:26: error: format '%d' expects argument of type 'int',
but argument 3 has type 'long unsigned int' [-Werror=format=]
114 | printw(_("Viewing line %d/%d, 100%%"), lines, lines);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~
While at it pull upstream fix for -fcommon toolchains (vanilla gcc-10)
and pending fix for gcc-11.
+26
pkgs/applications/misc/pinfo/default.nix
+26
pkgs/applications/misc/pinfo/default.nix
···
1
1
{ lib
2
2
, autoreconfHook
3
3
, fetchFromGitHub
4
+
, fetchpatch
4
5
, gettext
5
6
, ncurses
6
7
, readline
···
18
19
rev = "v${version}";
19
20
sha256 = "173d2p22irwiabvr4z6qvr6zpr6ysfkhmadjlyhyiwd7z62larvy";
20
21
};
22
+
23
+
patches = [
24
+
# Pull upstream fix for -fno-common toolchains
25
+
(fetchpatch {
26
+
name = "fno-common.patch";
27
+
url = "https://github.com/baszoetekouw/pinfo/commit/16dba5978146b6d3a540ac7c8f415eda49280847.patch";
28
+
sha256 = "148fm32chvq8x9ayq9cnhgszh10g5v0cv0xph67fa7sp341p09wy";
29
+
})
30
+
31
+
# Fix pending upstream inclusion for build on ncurses-6.3:
32
+
# https://github.com/baszoetekouw/pinfo/pull/27
33
+
(fetchpatch {
34
+
name = "ncurses-6.3.patch";
35
+
url = "https://github.com/baszoetekouw/pinfo/commit/fc67ceacd81f0c74fcab85447c23a532ae482827.patch";
36
+
sha256 = "08phmng8vgfqjjazys05acpd5gh110malhw3sx29dg86nsrg2khs";
37
+
})
38
+
39
+
# Fix pending upstream inclusion for build on gcc-11:
40
+
# https://github.com/baszoetekouw/pinfo/pull/27
41
+
(fetchpatch {
42
+
name = "gcc-11.patch";
43
+
url = "https://github.com/baszoetekouw/pinfo/commit/ab604fdb67296dad27f3a25f3c9aabdd2fb8c3fa.patch";
44
+
sha256 = "09g8msgan2x48hxcbm7l6j3av6n8i0bsd4g0vf5xd8bxwzynb13m";
45
+
})
46
+
];
21
47
22
48
nativeBuildInputs = [
23
49
autoreconfHook