From 7af9db4c34027d128c7646bfab94507166a417bd Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Fri, 17 Oct 2025 12:00:00 +0000 Subject: [PATCH] dsniff: 2.4b1+debian-34 -> 2.4b1+debian-35 Fixes: https://github.com/NixOS/nixpkgs/issues/444046 --- pkgs/by-name/ds/dsniff/package.nix | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ds/dsniff/package.nix b/pkgs/by-name/ds/dsniff/package.nix index 316b728868d3..a37d81216eaf 100644 --- a/pkgs/by-name/ds/dsniff/package.nix +++ b/pkgs/by-name/ds/dsniff/package.nix @@ -34,11 +34,23 @@ let }; pcap = symlinkJoin { inherit (libpcap) name; - paths = [ (libpcap.overrideAttrs { dontDisableStatic = true; }) ]; + paths = + let + staticlibpcap = libpcap.overrideAttrs { dontDisableStatic = true; }; + in + [ + (lib.getInclude staticlibpcap) + (lib.getLib staticlibpcap) + ]; postBuild = '' cp -rs $out/include/pcap $out/include/net - # prevent references to libpcap - rm $out/lib/*.so* + # check the presence of the files that ./configure expects + for i in $out/lib/libpcap.a $out/include/pcap.h $out/include/net/bpf.h; do + if ! test -f $i; then + echo $i is missing from output + exit 1 + fi + done ''; }; net = symlinkJoin { @@ -71,8 +83,8 @@ stdenv.mkDerivation rec { domain = "salsa.debian.org"; owner = "pkg-security-team"; repo = "dsniff"; - rev = "debian/${version}+debian-34"; - sha256 = "sha256-CY0+G09KZXtAwKuaYh5/qcmZjuNhdGis3zCG14hWtqw="; + tag = "debian/${version}+debian-35"; + hash = "sha256-RVv9USAHTVYnGgKygIPgfXpfjCYigJvScuzc2+1Uzfw="; name = "dsniff.tar.gz"; };