From 995dc69ca4a345e10f5d0f714ce05a0a14ed25e1 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 21 Jun 2023 16:39:32 +0800 Subject: [PATCH] dhcpdump: rework packaging, fix cross compilation --- pkgs/tools/networking/dhcpdump/default.nix | 31 +++++++++++++++++----- 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/networking/dhcpdump/default.nix b/pkgs/tools/networking/dhcpdump/default.nix index d940731c7c95..345b8914a572 100644 --- a/pkgs/tools/networking/dhcpdump/default.nix +++ b/pkgs/tools/networking/dhcpdump/default.nix @@ -1,21 +1,40 @@ -{ lib, stdenv, fetchurl, libpcap, perl }: +{ lib +, stdenv +, fetchurl +, perl +, installShellFiles +, libpcap +}: stdenv.mkDerivation rec { pname = "dhcpdump"; version = "1.8"; src = fetchurl { - url = "mirror://ubuntu/pool/universe/d/dhcpdump/dhcpdump_${version}.orig.tar.gz"; - sha256 = "143iyzkqvhj4dscwqs75jvfr4wvzrs11ck3fqn5p7yv2h50vjpkd"; + url = "http://www.mavetju.org/download/dhcpdump-${version}.tar.gz"; + hash = "sha256-bV65QYFi+3OLxW5MFoLOf3OS3ZblaMyZbkTCjef3cZA="; }; - buildInputs = [libpcap perl]; + strictDeps = true; + + nativeBuildInputs = [ + perl # pod2man + installShellFiles + ]; + + buildInputs = [ + libpcap + ]; hardeningDisable = [ "fortify" ]; installPhase = '' - mkdir -pv $out/bin - cp dhcpdump $out/bin + runHook preBuild + + install -Dm555 dhcpdump "$out/bin/dhcpdump" + installManPage dhcpdump.8 + + runHook postBuild ''; meta = with lib; {