diff options
author | Sergei Trofimovich <slyich@gmail.com> | 2021-11-13 21:12:08 +0000 |
---|---|---|
committer | Robert Helgesson <robert@rycee.net> | 2021-11-13 22:30:46 +0100 |
commit | 3efa5631b2f4d6c359c34a9ccd3c2e77fb40c8e9 (patch) | |
tree | 3e78ae6334201fb90abd3358f94e32725561dce0 | |
parent | 542f6c07f53e20c3993ac0d53fe98a51d35b64b0 (diff) |
nethogs: pull upstream fix for ncurses-6.3
Without the fix build on ncurses-6.3 fails as: cui.cpp: In function ‘void show_ncurses(Line**, int)’: cui.cpp:377:73: error: format not a string literal and no format arguments [-Werror=format-security] 377 | mvprintw(3 + 1 + i, cols - COLUMN_WIDTH_UNIT, desc_view_mode[viewMode]); | ^
-rw-r--r-- | pkgs/tools/networking/nethogs/default.nix | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/tools/networking/nethogs/default.nix b/pkgs/tools/networking/nethogs/default.nix index 872e22a4f2ab1..c26cb527f55e9 100644 --- a/pkgs/tools/networking/nethogs/default.nix +++ b/pkgs/tools/networking/nethogs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, ncurses, libpcap }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, ncurses, libpcap }: stdenv.mkDerivation rec { pname = "nethogs"; @@ -11,6 +11,16 @@ stdenv.mkDerivation rec { sha256 = "0sn1sdp86akwlm4r1vmkxjjl50c0xaisk91bbz57z7kcsaphxna9"; }; + patches = [ + # Pull upstream patch for ncurses-6.3 support: + # https://github.com/raboof/nethogs/pull/210 + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://github.com/raboof/nethogs/commit/455daf357da7f394763e5b93b11b3defe1f82ed1.patch"; + sha256 = "0wkp0yr6qg1asgvmsn7blf7rq48sh5k4n3w0nxf5869hxvkhnnzs"; + }) + ]; + buildInputs = [ ncurses libpcap ]; makeFlags = [ "VERSION=${version}" "nethogs" ]; |