diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2021-05-24 08:40:49 +0200 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2021-05-24 09:09:48 +0200 |
| commit | 9d002b110e74cb73b0e08029088d1f034c23f80a (patch) | |
| tree | e356d5e42d38af169b7559a5bd94e16bb39bfd02 /pkgs/os-specific/linux/pktgen | |
| parent | 00a7a0f609352bd077b6c4d5dab88bddb70458fc (diff) | |
| download | nixpkgs-9d002b110e74cb73b0e08029088d1f034c23f80a.tar nixpkgs-9d002b110e74cb73b0e08029088d1f034c23f80a.tar.gz nixpkgs-9d002b110e74cb73b0e08029088d1f034c23f80a.tar.bz2 nixpkgs-9d002b110e74cb73b0e08029088d1f034c23f80a.tar.lz nixpkgs-9d002b110e74cb73b0e08029088d1f034c23f80a.tar.xz nixpkgs-9d002b110e74cb73b0e08029088d1f034c23f80a.tar.zst nixpkgs-9d002b110e74cb73b0e08029088d1f034c23f80a.zip | |
pktgen: 19.12.0 -> 21.05.0
Diffstat (limited to 'pkgs/os-specific/linux/pktgen')
| -rw-r--r-- | pkgs/os-specific/linux/pktgen/configure.patch | 17 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/pktgen/default.nix | 24 |
2 files changed, 14 insertions, 27 deletions
diff --git a/pkgs/os-specific/linux/pktgen/configure.patch b/pkgs/os-specific/linux/pktgen/configure.patch deleted file mode 100644 index b4933313a51..00000000000 --- a/pkgs/os-specific/linux/pktgen/configure.patch +++ /dev/null @@ -1,17 +0,0 @@ -1. librte_process_info does not exist. -2. lua5.3 library is liblua. -3. app/meson.build uses undeclared drivers_install_subdir. ---- a/lib/common/meson.build -+++ b/lib/common/meson.build -@@ -34,1 +34,1 @@ --libs = ['eal', 'kvargs', 'cmdline', 'process_info'] -+libs = ['eal', 'kvargs', 'cmdline'] ---- a/lib/lua/meson.build -+++ b/lib/lua/meson.build -@@ -31 +31 @@ endforeach --ext_deps += cc.find_library('lua5.3', required: true) -+ext_deps += cc.find_library('lua', required: true) ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -0,0 +1,1 @@ -+option('drivers_install_subdir', type: 'string', value: '') diff --git a/pkgs/os-specific/linux/pktgen/default.nix b/pkgs/os-specific/linux/pktgen/default.nix index 47ca709c44b..5a1a56ab691 100644 --- a/pkgs/os-specific/linux/pktgen/default.nix +++ b/pkgs/os-specific/linux/pktgen/default.nix @@ -1,29 +1,33 @@ -{ stdenv, lib, fetchurl, meson, ninja, pkg-config +{ stdenv, lib, fetchFromGitHub, meson, ninja, pkg-config , dpdk, libbsd, libpcap, lua5_3, numactl, util-linux , gtk2, which, withGtk ? false }: stdenv.mkDerivation rec { pname = "pktgen"; - version = "19.12.0"; + version = "21.05.0"; - src = fetchurl { - url = "http://dpdk.org/browse/apps/pktgen-dpdk/snapshot/${pname}-${version}.tar.xz"; - sha256 = "1clfviz1qa4hysslcg6i29vsxwl9f6j1y7zf9wwx9br3yq08x956"; + src = fetchFromGitHub { + owner = "pktgen"; + repo = "Pktgen-DPDK"; + rev = "pktgen-${version}"; + sha256 = "sha256-7lLDtbd14olEHO+1BuI6KTEUNRM/zAyRXau/OZbYbGA="; }; nativeBuildInputs = [ meson ninja pkg-config ]; - buildInputs = - [ dpdk libbsd libpcap lua5_3 numactl which ] - ++ lib.optionals withGtk [gtk2]; + buildInputs = [ + dpdk libbsd libpcap lua5_3 numactl which + ] ++ lib.optionals withGtk [ + gtk2 + ]; RTE_SDK = dpdk; GUI = lib.optionalString withGtk "true"; NIX_CFLAGS_COMPILE = "-msse3"; - - patches = [ ./configure.patch ]; + # requires symbols from this file + NIX_LDFLAGS = "-lrte_net_bond"; postPatch = '' substituteInPlace lib/common/lscpu.h --replace /usr/bin/lscpu ${util-linux}/bin/lscpu |