Unverified Commit 15dc1884 authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

Merge pull request #231530 from mweinelt/odp-dpdk-openssl3 

odp-dpdk: Build against openssl3
parents aa0b851e f8cddd7f

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

+21 −18
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, autoreconfHook, pkg-config

, dpdk, libbpf, libconfig, libpcap, numactl, openssl, zlib, libbsd, libelf, jansson

{ lib

, stdenv

, fetchurl

, autoreconfHook

, pkg-config

, dpdk

, libbpf

, libconfig

, libpcap

, numactl

, openssl

, zlib

, libbsd

, libelf

, jansson

, libnl

}: let

  dpdk_19_11 = dpdk.overrideAttrs (old: rec {

    version = "19.11.12";

    src = fetchurl {

      url = "https://fast.dpdk.org/rel/dpdk-${version}.tar.xz";

      sha256 = "sha256-F9m2+MZi3n0psPIwjWwhiIbbNkoGlxqtru2OlV7TbzQ=";

    };

    mesonFlags = old.mesonFlags ++ [

      "-Denable_docs=false"

    ];

  });

}:



in stdenv.mkDerivation rec {

stdenv.mkDerivation rec {

  pname = "odp-dpdk";

  version = "1.37.0.0_DPDK_19.11";

  version = "1.41.0.0_DPDK_22.11";



  src = fetchurl {

    url = "https://git.linaro.org/lng/odp-dpdk.git/snapshot/${pname}-${version}.tar.gz";

    sha256 = "sha256-Ai6+6eZJeG0BrwNboBPfgDGkUbCC8lcj7+oxmWjWP2k=";

    hash = "sha256-4p+R+7IeDKQFqBzQTvXfR407exxhoS8pnKxF9Qnr8tw=";

  };



  nativeBuildInputs = [
@@ -28,7 +31,7 @@ in stdenv.mkDerivation rec { 
  ];



  buildInputs = [

    dpdk_19_11

    dpdk

    libconfig

    libpcap

    numactl

pkgs/top-level/all-packages.nix

+1 −3
Original line number Diff line number Diff line
@@ -27184,9 +27184,7 @@ with pkgs; 














  odin = callPackage ../development/compilers/odin { };



























  odp-dpdk = callPackage ../os-specific/linux/odp-dpdk {













    openssl = openssl_1_1;













  };













  odp-dpdk = callPackage ../os-specific/linux/odp-dpdk { };





























  odroid-xu3-bootloader = callPackage ../tools/misc/odroid-xu3-bootloader { };