git.iko.soy/typeable/nixpkgs
on master help sign in
nfstrace: pull pending upstream inclusion fix for ncurses-6.3

Without the fix build on ncurses-6.3 fails as: nfstrace/analyzers/src/watch/nc_windows/header_window.cpp:77:82: error: format '%d' expects argument of type 'int', but argument 5 has type 'time_t' {aka 'long int'} [-Werror=format=] 77 | mvwprintw(_window, HEADER::ELAPSED_LINE, FIRST_CHAR_POS, "Elapsed time: \t %d days; %d:%d:%d times", | ~^ | int | %ld While at it wropped blnket -Werror that fails on gcc-12 and clang-12.

commit7331816f56680397a0c294b5d5b8809e82c0752c authorSergei Trofimovich <slyich@gmail.com> dateThu 18 Nov 2021, 08:18 (5 years ago) parent5e39986
1 file changed+11
pkgs/tools/networking/nfstrace/default.nix+11
pkgs/tools/networking/nfstrace/default.nix+11
@@ -22,11 +22,22 @@ stdenv.mkDerivation rec {
2222 url = "https://github.com/epam/nfstrace/commit/4562a895ed3ac0e811bdd489068ad3ebe4d7b501.patch";
2323 sha256 = "1fbicbllyykjknik7asa81x0ixxmbwqwkiz74cnznagv10jlkj3p";
2424 })
25+
26+ # Fix pending upstream inclusion for ncurses-6.3 support:
27+ # https://github.com/epam/nfstrace/pull/50
28+ (fetchpatch {
29+ name = "ncurses-6.3.patch";
30+ url = "https://github.com/epam/nfstrace/commit/29c7c415f5412df1aae9b1e6ed3a2760d2c227a0.patch";
31+ sha256 = "134709w6bld010jx3xdy9imcjzal904a84n9f8vv0wnas5clxdmx";
32+ })
2533 ];
2634
2735 postPatch = ''
2836 substituteInPlace CMakeLists.txt \
2937 --replace "-Wno-braced-scalar-init" ""
38+ # -Wall -Wextra -Werror fails on clang and newer gcc
39+ substituteInPlace CMakeLists.txt \
40+ --replace "-Werror" ""
3041 '';
3142
3243 buildInputs = [ json_c libpcap ncurses libtirpc ];