pyrox.dev
hping: pull patch pending upstream inclusion for -fno-common toolchain support
Without the change build fails against upstream gcc-10 as:
ld: scan.o:/build/source/hping2.h:360: multiple definition of
`delaytable'; main.o:/build/source/hping2.h:360: first defined here
+10
-1
pkgs/tools/networking/hping/default.nix
+10
-1
pkgs/tools/networking/hping/default.nix
···
1
-
{ lib, stdenv, fetchFromGitHub, libpcap, withTcl ? true, tcl }:
2
3
stdenv.mkDerivation rec {
4
pname = "hping";
···
10
rev = "3547c7691742c6eaa31f8402e0ccbb81387c1b99"; # there are no tags/releases
11
sha256 = "0y0n1ybij3yg9lfgzcwfmjz1sjg913zcqrv391xx83dm0j80sdpb";
12
};
13
14
buildInputs = [ libpcap ] ++ lib.optional withTcl tcl;
15
···
1
+
{ lib, stdenv, fetchFromGitHub, fetchpatch, libpcap, withTcl ? true, tcl }:
2
3
stdenv.mkDerivation rec {
4
pname = "hping";
···
10
rev = "3547c7691742c6eaa31f8402e0ccbb81387c1b99"; # there are no tags/releases
11
sha256 = "0y0n1ybij3yg9lfgzcwfmjz1sjg913zcqrv391xx83dm0j80sdpb";
12
};
13
+
patches = [
14
+
# Pull patch pending upstream inclusion for -fno-common toolchain
15
+
# support: https://github.com/antirez/hping/pull/64
16
+
(fetchpatch {
17
+
name = "fno-common.patch";
18
+
url = "https://github.com/antirez/hping/pull/64/commits/d057b9309aec3a5a53aaee1ac3451a8a5b71b4e8.patch";
19
+
sha256 = "0bqr7kdlziijja588ipj8g5hv2109wq01c6x2qadbhjfnsps1b6l";
20
+
})
21
+
];
22
23
buildInputs = [ libpcap ] ++ lib.optional withTcl tcl;
24