pyrox.dev
Merge #222033: xdp-tools: 1.2.9 -> 1.3.1
+12
-2
pkgs/tools/networking/xdp-tools/default.nix
+12
-2
pkgs/tools/networking/xdp-tools/default.nix
···
6
6
, elfutils
7
7
, zlib
8
8
, libpcap
9
+
, bpftools
9
10
, llvmPackages
10
11
, pkg-config
11
12
, m4
···
15
16
}:
16
17
stdenv.mkDerivation rec {
17
18
pname = "xdp-tools";
18
-
version = "1.2.9";
19
+
version = "1.3.1";
19
20
20
21
src = fetchFromGitHub {
21
22
owner = "xdp-project";
22
23
repo = "xdp-tools";
23
24
rev = "v${version}";
24
-
sha256 = "Q1vaogcAeNjLIPaB0ovOo96hzRv69tMO5xwHh5W4Ws0=";
25
+
sha256 = "ctggXzc3qA+m2/nJ9lmR/pERj0YyPko3MTttm8e85cU=";
25
26
};
26
27
28
+
patches = [
29
+
# Fix function detection for btf__type_cnt()
30
+
(fetchpatch {
31
+
url = "https://github.com/xdp-project/xdp-tools/commit/a7df567634af77381832a2212c5f5099b07734f3.patch";
32
+
sha256 = "1i4s4y0z9pf3dnjzxy8k0jkjshhz3b0v49qw4cspjrjlmcmy0x00";
33
+
})
34
+
];
35
+
27
36
outputs = [ "out" "lib" ];
28
37
29
38
buildInputs = [
···
37
46
emacs-nox # to generate man pages from .org
38
47
];
39
48
nativeBuildInputs = [
49
+
bpftools
40
50
llvmPackages.clang
41
51
llvmPackages.llvm
42
52
pkg-config