From a2f07442f70e2748b641c015e202ec51d4d42c61 Mon Sep 17 00:00:00 2001 From: oluceps Date: Sun, 16 Jun 2024 17:13:18 +0000 Subject: [PATCH] dae: add missing subcommand `trace` This will build the `trace` command which dae added few months ago. See for detail. Co-authored-by: Aleksana --- pkgs/tools/networking/dae/default.nix | 28 ++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/networking/dae/default.nix b/pkgs/tools/networking/dae/default.nix index 89f961c47392..2f8f4236837a 100644 --- a/pkgs/tools/networking/dae/default.nix +++ b/pkgs/tools/networking/dae/default.nix @@ -1,7 +1,8 @@ -{ lib -, clang -, fetchFromGitHub -, buildGoModule +{ + lib, + clang, + fetchFromGitHub, + buildGoModule, }: buildGoModule rec { pname = "dae"; @@ -21,17 +22,15 @@ buildGoModule rec { nativeBuildInputs = [ clang ]; - ldflags = [ - "-s" - "-w" - "-X github.com/daeuniverse/dae/cmd.Version=${version}" - "-X github.com/daeuniverse/dae/common/consts.MaxMatchSetLen_=64" - ]; + buildPhase = '' + runHook preBuild - preBuild = '' make CFLAGS="-D__REMOVE_BPF_PRINTK -fno-stack-protector -Wno-unused-command-line-argument" \ NOSTRIP=y \ - ebpf + VERSION=${version} \ + OUTPUT=$out/bin/dae + + runHook postBuild ''; # network required @@ -47,7 +46,10 @@ buildGoModule rec { description = "Linux high-performance transparent proxy solution based on eBPF"; homepage = "https://github.com/daeuniverse/dae"; license = licenses.agpl3Only; - maintainers = with maintainers; [ oluceps pokon548 ]; + maintainers = with maintainers; [ + oluceps + pokon548 + ]; platforms = platforms.linux; mainProgram = "dae"; };