Merge #148726: tcptrack: fix build with ncurses-6.3
This commit is contained in:
commit
826cacf0ac
1 changed files with 14 additions and 4 deletions
|
@ -1,16 +1,26 @@
|
||||||
{ lib, stdenv, fetchFromGitHub, ncurses, libpcap }:
|
{ lib, stdenv, fetchFromGitHub, fetchpatch, ncurses, libpcap }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "tcptrack";
|
pname = "tcptrack";
|
||||||
version = "1.4.3";
|
version = "unstable-2017-04-29";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "bchretien";
|
owner = "bchretien";
|
||||||
repo = "tcptrack";
|
repo = "tcptrack";
|
||||||
rev = "d05fe08154ff1e46578e92be49e4cfa2c6543283";
|
rev = "2b096ac103af2884bbd7648cff8adcbadbda9394";
|
||||||
sha256 = "08lh3l67wn4kq9q0nfspc7rj0jvp9dzwjgxpvqliwcif8cy5mi45";
|
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 ];
|
buildInputs = [ ncurses libpcap ];
|
||||||
|
|
||||||
NIX_CFLAGS_COMPILE = "-Wno-error=cpp";
|
NIX_CFLAGS_COMPILE = "-Wno-error=cpp";
|
||||||
|
|
Loading…
Reference in a new issue