diff options
| author | a-n-n-a-l-e-e <150648636+a-n-n-a-l-e-e@users.noreply.github.com> | 2024-03-15 18:13:14 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-15 18:13:14 -0700 |
| commit | c2e03072b8e365b0a76cf884f781f0f196b96214 (patch) | |
| tree | 66b6dcea46a00203a35a3990dc045068748b7766 | |
| parent | 90d4146a881ecbc59573bcebecbb055da8cb19be (diff) | |
| parent | 9d1489e2cc67ea94967ac938dff8d651be95f815 (diff) | |
Merge pull request #295168 from philiptaron/deprecate-libelf-dpdk
dpdk: use `elfutils` instead of abandoned `libelf`
| -rw-r--r-- | pkgs/os-specific/linux/dpdk/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/odp-dpdk/default.nix | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix index c92f40e3935ff..5c20e45ec354f 100644 --- a/pkgs/os-specific/linux/dpdk/default.nix +++ b/pkgs/os-specific/linux/dpdk/default.nix @@ -2,7 +2,7 @@ , kernel , fetchurl , pkg-config, meson, ninja, makeWrapper -, libbsd, numactl, libbpf, zlib, libelf, jansson, openssl, libpcap, rdma-core +, libbsd, numactl, libbpf, zlib, elfutils, jansson, openssl, libpcap, rdma-core , doxygen, python3, pciutils , withExamples ? [] , shared ? false @@ -38,7 +38,7 @@ in stdenv.mkDerivation { buildInputs = [ jansson libbpf - libelf + elfutils libpcap numactl openssl.dev diff --git a/pkgs/os-specific/linux/odp-dpdk/default.nix b/pkgs/os-specific/linux/odp-dpdk/default.nix index 7ac560824db8c..bc8bf488def91 100644 --- a/pkgs/os-specific/linux/odp-dpdk/default.nix +++ b/pkgs/os-specific/linux/odp-dpdk/default.nix @@ -10,8 +10,9 @@ , numactl , openssl , zlib +, zstd , libbsd -, libelf +, elfutils , jansson , libnl }: @@ -37,8 +38,9 @@ stdenv.mkDerivation rec { numactl openssl zlib + zstd libbsd - libelf + elfutils jansson libbpf libnl |