diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2021-05-24 08:15:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-24 08:15:17 +0100 |
| commit | 8ab19de80deafcbf35992b35599d2c80378ae89c (patch) | |
| tree | 0cea352c02fd45e87567a27b75f3e78e8a5ed8d7 /pkgs/os-specific/linux/dpdk | |
| parent | b15dddd9e1101fb8e2eae3a68faabf8a73dc6d5b (diff) | |
| parent | b50d58d9884bcd9216376e0f2c8f8f096572e7bf (diff) | |
| download | nixpkgs-8ab19de80deafcbf35992b35599d2c80378ae89c.tar nixpkgs-8ab19de80deafcbf35992b35599d2c80378ae89c.tar.gz nixpkgs-8ab19de80deafcbf35992b35599d2c80378ae89c.tar.bz2 nixpkgs-8ab19de80deafcbf35992b35599d2c80378ae89c.tar.lz nixpkgs-8ab19de80deafcbf35992b35599d2c80378ae89c.tar.xz nixpkgs-8ab19de80deafcbf35992b35599d2c80378ae89c.tar.zst nixpkgs-8ab19de80deafcbf35992b35599d2c80378ae89c.zip | |
Merge pull request #122588 from Mic92/dpdk
dpdk: 20.05 -> 21.02
Diffstat (limited to 'pkgs/os-specific/linux/dpdk')
| -rw-r--r-- | pkgs/os-specific/linux/dpdk/default.nix | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix index 38dac78b3fe..acb3da11fd1 100644 --- a/pkgs/os-specific/linux/dpdk/default.nix +++ b/pkgs/os-specific/linux/dpdk/default.nix @@ -8,14 +8,14 @@ let mod = kernel != null; - + dpdkVersion = "21.02"; in stdenv.mkDerivation rec { - name = "dpdk-${version}" + lib.optionalString mod "-${kernel.version}"; - version = "20.05"; + pname = "dpdk"; + version = "${dpdkVersion}" + lib.optionalString mod "-${kernel.version}"; src = fetchurl { - url = "https://fast.dpdk.org/rel/dpdk-${version}.tar.xz"; - sha256 = "0h0xv2zwb91b9n29afg5ihn06a8q28in64hag2f112kc19f79jj8"; + url = "https://fast.dpdk.org/rel/dpdk-${dpdkVersion}.tar.xz"; + sha256 = "sha256-CZJKKoJVGqKZeKNoYYT4oQX1L1ZAsb4of1QLLJHpSJs=="; }; nativeBuildInputs = [ @@ -25,6 +25,7 @@ in stdenv.mkDerivation rec { pkg-config python3 python3.pkgs.sphinx + python3.pkgs.pyelftools ]; buildInputs = [ jansson @@ -42,9 +43,12 @@ in stdenv.mkDerivation rec { ''; mesonFlags = [ + "-Dtests=false" "-Denable_docs=true" "-Denable_kmods=${lib.boolToString mod}" ] + # kni kernel driver is currently not compatble with 5.11 + ++ lib.optional (mod && kernel.kernelOlder "5.11") "-Ddisable_drivers=kni" ++ lib.optional (!shared) "-Ddefault_library=static" ++ lib.optional stdenv.isx86_64 "-Dmachine=nehalem" ++ lib.optional mod "-Dkernel_dir=${placeholder "kmod"}/lib/modules/${kernel.modDirVersion}"; |