From db2f878e26a6cea8bca248493121e21b9fd8cf88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Thu, 15 Sep 2022 22:47:05 +0200 Subject: [PATCH] tracebox: 0.2 -> 0.4.4 --- pkgs/tools/networking/tracebox/default.nix | 39 ++++++++++++++-------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/networking/tracebox/default.nix b/pkgs/tools/networking/tracebox/default.nix index 79efc95036d9..3c3277e2bc7d 100644 --- a/pkgs/tools/networking/tracebox/default.nix +++ b/pkgs/tools/networking/tracebox/default.nix @@ -1,34 +1,45 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, libcrafter, libpcap, lua }: - +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, libpcap +, lua5_1 +, json_c +}: stdenv.mkDerivation rec { pname = "tracebox"; - version = "0.2"; + version = "0.4.4"; src = fetchFromGitHub { owner = "tracebox"; repo = "tracebox"; rev = "v${version}"; - hash = "sha256-2r503xEF3/F9QQCEaSnd4Hw/RbbAhVj9C0SVZepVrT8="; + hash = "sha256-1KBJ4uXa1XpzEw23IjndZg+aGJXk3PVw8LYKAvxbxCA="; + fetchSubmodules = true; }; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ libcrafter lua ]; + buildInputs = [ + libpcap + lua5_1 + json_c + ]; - configureFlags = [ "--with-lua=yes" ]; + configureFlags = [ + "--with-lua=yes" + "--with-libpcap=yes" + ]; - NIX_LDFLAGS = "${libpcap}/lib/libpcap.so ${libcrafter}/lib/libcrafter.so"; + PCAPLIB="-lpcap"; + LUA_LIB="-llua"; - preAutoreconf = '' - substituteInPlace Makefile.am --replace "noinst" "" - sed '/noinst/d' -i configure.ac - sed '/libcrafter/d' -i src/tracebox/Makefile.am - ''; + enableParallelBuilding = true; meta = with lib; { homepage = "http://www.tracebox.org/"; description = "A middlebox detection tool"; - license = lib.licenses.gpl2; - maintainers = [ ]; + license = licenses.gpl2; + maintainers = with maintainers; [ ck3d ]; platforms = platforms.linux; }; }