diff options
| author | Robin Gloster <mail@glob.in> | 2016-07-15 14:41:01 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-07-15 14:41:01 +0000 |
| commit | 5185bc177309c62e53dad1ad346d1220f0e77bd4 (patch) | |
| tree | 52f5878b394abf2ef326765d46880ccbabd84903 /pkgs/os-specific/linux/pktgen/default.nix | |
| parent | 07615735077db344539eb9131823600593f0eddf (diff) | |
| parent | f402c6321aa3c6e56f5e1f1e36c4ad459c881309 (diff) | |
| download | nixpkgs-5185bc177309c62e53dad1ad346d1220f0e77bd4.tar nixpkgs-5185bc177309c62e53dad1ad346d1220f0e77bd4.tar.gz nixpkgs-5185bc177309c62e53dad1ad346d1220f0e77bd4.tar.bz2 nixpkgs-5185bc177309c62e53dad1ad346d1220f0e77bd4.tar.lz nixpkgs-5185bc177309c62e53dad1ad346d1220f0e77bd4.tar.xz nixpkgs-5185bc177309c62e53dad1ad346d1220f0e77bd4.tar.zst nixpkgs-5185bc177309c62e53dad1ad346d1220f0e77bd4.zip | |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/os-specific/linux/pktgen/default.nix')
| -rw-r--r-- | pkgs/os-specific/linux/pktgen/default.nix | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/pkgs/os-specific/linux/pktgen/default.nix b/pkgs/os-specific/linux/pktgen/default.nix index 456e9a4679c..5154ccce1b4 100644 --- a/pkgs/os-specific/linux/pktgen/default.nix +++ b/pkgs/os-specific/linux/pktgen/default.nix @@ -1,26 +1,34 @@ -{ stdenv, fetchurl, dpdk, libpcap, utillinux }: +{ stdenv, fetchurl, dpdk, libpcap, utillinux +, pkgconfig +, gtk, withGtk ? false +}: stdenv.mkDerivation rec { name = "pktgen-${version}"; - version = "3.0.00"; + version = "3.0.04"; src = fetchurl { url = "http://dpdk.org/browse/apps/pktgen-dpdk/snapshot/pktgen-${version}.tar.gz"; - sha256 = "703f8bd615aa4ae3a3085055483f9889dda09d082abb58afd33c1ba7c766ea65"; + sha256 = "0vrmbpl8zaal5zjwyzlx0y3d6jydfxdmf0psdj7ic37h5yh2iv2q"; }; - buildInputs = [ dpdk libpcap ]; + nativeBuildInputs = stdenv.lib.optionals withGtk [ pkgconfig ]; + + buildInputs = + [ dpdk libpcap ] + ++ stdenv.lib.optionals withGtk [gtk]; RTE_SDK = "${dpdk}"; RTE_TARGET = "x86_64-native-linuxapp-gcc"; + GUI = stdenv.lib.optionalString withGtk "true"; enableParallelBuilding = true; NIX_CFLAGS_COMPILE = [ "-march=core2" ]; - patchPhase = '' - sed -i -e s:/usr/local:$out:g lib/lua/src/luaconf.h - sed -i -e s:/usr/bin/lscpu:${utillinux}/bin/lscpu:g lib/common/wr_lscpu.h + postPatch = '' + substituteInPlace lib/lua/src/luaconf.h --replace /usr/local $out + substituteInPlace lib/common/wr_lscpu.h --replace /usr/bin/lscpu ${utillinux}/bin/lscpu ''; installPhase = '' |