Unverified Commit c2e03072 authored by a-n-n-a-l-e-e's avatar a-n-n-a-l-e-e Committed by GitHub
Browse files

Merge pull request #295168 from philiptaron/deprecate-libelf-dpdk 

dpdk: use `elfutils` instead of abandoned `libelf`
parents 90d4146a 9d1489e2

pkgs/os-specific/linux/dpdk/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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

pkgs/os-specific/linux/odp-dpdk/default.nix

+4 −2
Original line number Diff line number Diff line
@@ -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