git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #146469 from trofi/fix-nfstrace-for-ncurses-6.3

nfstrace: pull pending upstream inclusion fix for ncurses-6.3

commit6829748b819051dd5d4a13d85a613741f7c6919e authorJörg Thalheim <Mic92@users.noreply.github.com> dateWed 1 Dec 2021, 08:56 (5 years ago) parent7e513ad568e4f5
1 file changed+11−1
pkgs/tools/networking/nfstrace/default.nix+11−1
pkgs/tools/networking/nfstrace/default.nix+11−1
@@ -22,11 +22,21 @@ 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 = ''
36+ # -Wall -Wextra -Werror fails on clang and newer gcc
2837 substituteInPlace CMakeLists.txt \
29− --replace "-Wno-braced-scalar-init" ""
38+ --replace "-Wno-braced-scalar-init" "" \
39+ --replace "-Werror" ""
3040 '';
3141
3242 buildInputs = [ json_c libpcap ncurses libtirpc ];