diff options
author | magenbluten <magenbluten@codemonkey.cc> | 2019-08-07 07:05:03 +0200 |
---|---|---|
committer | magenbluten <magenbluten@codemonkey.cc> | 2019-10-15 11:07:53 +0200 |
commit | 7c534798a6739e122e20692d10ab8d22f84a9872 (patch) | |
tree | fe65217e76aa1a97f78db5c80ff0256e47b88f25 /pkgs/os-specific | |
parent | 3812fc96b54dcf3e3410ba12509204486312c2f1 (diff) |
pktgen: 3.5.0 -> 3.7.2
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r-- | pkgs/os-specific/linux/pktgen/default.nix | 32 |
1 files changed, 8 insertions, 24 deletions
diff --git a/pkgs/os-specific/linux/pktgen/default.nix b/pkgs/os-specific/linux/pktgen/default.nix index 0d92c7c690981..157bd02a06c67 100644 --- a/pkgs/os-specific/linux/pktgen/default.nix +++ b/pkgs/os-specific/linux/pktgen/default.nix @@ -1,33 +1,23 @@ { stdenv, lib, fetchurl, pkgconfig -, dpdk, libpcap, numactl, utillinux -, gtk2, withGtk ? false +, dpdk, libpcap, lua5_3, numactl, utillinux +, gtk2, which, withGtk ? false }: let - # pktgen needs a specific version of lua to apply its patch (see lib/lua/Makefile). - lua = rec { - name = "lua-5.3.4"; - basename = name + ".tar.gz"; - src = fetchurl { - url = "https://www.lua.org/ftp/${basename}"; - sha256 = "0320a8dg3aci4hxla380dx1ifkw8gj4gbw5c4dz41g1kh98sm0gn"; - }; - }; - in stdenv.mkDerivation rec { pname = "pktgen"; - version = "3.5.0"; + version = "3.7.2"; src = fetchurl { - url = "http://dpdk.org/browse/apps/pktgen-dpdk/snapshot/pktgen-${version}.tar.xz"; - sha256 = "1gy99jr9dbwzi9pd3w5k673h3pfnbkz6rbzmrkwcyis72pnphy5z"; + url = "http://dpdk.org/browse/apps/pktgen-dpdk/snapshot/${pname}-${version}.tar.xz"; + sha256 = "03k7h4j2lsrh6b7477hgn87ljrjh2673ncffx9v261bx1ns54y7w"; }; - nativeBuildInputs = stdenv.lib.optionals withGtk [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = - [ dpdk libpcap numactl ] + [ dpdk libpcap lua5_3 numactl which ] ++ stdenv.lib.optionals withGtk [gtk2]; RTE_SDK = "${dpdk}/share/dpdk"; @@ -37,19 +27,13 @@ in stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-msse3" ]; postPatch = let dpdkMajor = lib.versions.major dpdk.version; in '' - substituteInPlace app/Makefile --replace 'yy :=' 'yy := ${dpdkMajor} #' substituteInPlace lib/common/lscpu.h --replace /usr/bin/lscpu ${utillinux}/bin/lscpu - - ln -s ${lua.src} lib/lua/${lua.basename} - make -C lib/lua get_tarball # unpack and patch - substituteInPlace lib/lua/${lua.name}/src/luaconf.h --replace /usr/local $out ''; installPhase = '' install -d $out/bin install -m 0755 app/${RTE_TARGET}/pktgen $out/bin - install -d $out/lib/lua/5.3 - install -m 0644 Pktgen.lua $out/lib/lua/5.3 + install -m 0644 Pktgen.lua $out/bin ''; enableParallelBuilding = true; |