pyrox.dev
vpp: patch CMakeLists.txt so that the AF_XDP plugin builds (#442342)
+6
-6
pkgs/by-name/vp/vpp/package.nix
+6
-6
pkgs/by-name/vp/vpp/package.nix
···
38
];
39
});
40
41
-
xdp-tools' = xdp-tools.overrideAttrs (old: {
42
-
postInstall = "";
43
-
dontDisableStatic = true;
44
-
});
45
-
46
# in 25.02 only ID seems to be of interest, so keep it simple
47
os-release-fake = writeText "os-release-fake" ''
48
ID=nixos
···
116
# af_xdp plugin
117
libelf
118
libbpf
119
-
xdp-tools'
120
];
121
122
passthru.updateScript = nix-update-script { };
···
38
];
39
});
40
41
# in 25.02 only ID seems to be of interest, so keep it simple
42
os-release-fake = writeText "os-release-fake" ''
43
ID=nixos
···
111
# af_xdp plugin
112
libelf
113
libbpf
114
+
xdp-tools
115
+
zlib
116
+
];
117
+
118
+
patches = lib.optionals enableAfXdp [
119
+
./use-dynamic-libxdp-libbpf.patch
120
];
121
122
passthru.updateScript = nix-update-script { };
+13
pkgs/by-name/vp/vpp/use-dynamic-libxdp-libbpf.patch
+13
pkgs/by-name/vp/vpp/use-dynamic-libxdp-libbpf.patch
···
···
1
+
--- a/plugins/af_xdp/CMakeLists.txt
2
+
+++ b/plugins/af_xdp/CMakeLists.txt
3
+
@@ -18,8 +18,8 @@ if (NOT XDP_INCLUDE_DIR)
4
+
endif()
5
+
6
+
set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS TRUE)
7
+
-vpp_plugin_find_library(af_xdp XDP_LIB libxdp.a)
8
+
-vpp_plugin_find_library(af_xdp BPF_LIB libbpf.a)
9
+
+vpp_plugin_find_library(af_xdp XDP_LIB xdp)
10
+
+vpp_plugin_find_library(af_xdp BPF_LIB bpf)
11
+
vpp_plugin_find_library(af_xdp ELF_LIB elf)
12
+
vpp_plugin_find_library(af_xdp Z_LIB z)
13
+
if (NOT XDP_LIB OR NOT BPF_LIB OR NOT ELF_LIB OR NOT Z_LIB)