diff options
author | Sergei Trofimovich <slyich@gmail.com> | 2021-12-05 15:55:25 +0000 |
---|---|---|
committer | Sergei Trofimovich <slyich@gmail.com> | 2021-12-05 15:58:17 +0000 |
commit | 4f1f0e5451925eb820a982f58619d70f216804e0 (patch) | |
tree | 96ad6c0d016f3a9bc6afc0f7730875948570a1fd | |
parent | 76b2fabd0ab71a474da0733a3d1f31d1a91325ec (diff) | |
download | nixpkgs-4f1f0e5451925eb820a982f58619d70f216804e0.tar nixpkgs-4f1f0e5451925eb820a982f58619d70f216804e0.tar.gz nixpkgs-4f1f0e5451925eb820a982f58619d70f216804e0.tar.bz2 nixpkgs-4f1f0e5451925eb820a982f58619d70f216804e0.tar.lz nixpkgs-4f1f0e5451925eb820a982f58619d70f216804e0.tar.xz nixpkgs-4f1f0e5451925eb820a982f58619d70f216804e0.tar.zst nixpkgs-4f1f0e5451925eb820a982f58619d70f216804e0.zip |
tcptrack: fix build on ncurses-6.3
Without the change the build fails on ncurses-6.3 as: TextUI.cc: In member function 'void TextUI::drawui()': TextUI.cc:312:34: error: format '%d' expects argument of type 'int', but argument 2 has type 'time_t' {aka 'long int'} [-Werror=format] 312 | printw("%ds",ic->getIdleSeconds()); | ~^ ~~~~~~~~~~~~~~~~~~~~ | int time_t {aka long int} | %ld
-rw-r--r-- | pkgs/development/tools/misc/tcptrack/default.nix | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/pkgs/development/tools/misc/tcptrack/default.nix b/pkgs/development/tools/misc/tcptrack/default.nix index 5b1fd72a7f5..d4691bc093a 100644 --- a/pkgs/development/tools/misc/tcptrack/default.nix +++ b/pkgs/development/tools/misc/tcptrack/default.nix @@ -1,16 +1,26 @@ -{ lib, stdenv, fetchFromGitHub, ncurses, libpcap }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, ncurses, libpcap }: stdenv.mkDerivation rec { pname = "tcptrack"; - version = "1.4.3"; + version = "1.4.3+unstable=2017-04-29"; src = fetchFromGitHub { owner = "bchretien"; repo = "tcptrack"; - rev = "d05fe08154ff1e46578e92be49e4cfa2c6543283"; - sha256 = "08lh3l67wn4kq9q0nfspc7rj0jvp9dzwjgxpvqliwcif8cy5mi45"; + rev = "2b096ac103af2884bbd7648cff8adcbadbda9394"; + sha256 = "0084g9s0ynv1az67j08q9nz4p07bqqz9k6w5lprzj3ljlh0x10gj"; }; + patches = [ + # Fix pending upstream inclusion for ncurses-6.3 support: + # https://github.com/bchretien/tcptrack/pull/10 + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://github.com/bchretien/tcptrack/commit/409007afbce8ec5a81312a2a4123dd83b62b4494.patch"; + sha256 = "00641jyr52ksww5bbzvxlprmbb36jnvzg2w1aj1jgnm75jiajcfc"; + }) + ]; + buildInputs = [ ncurses libpcap ]; NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; |