Merge pull request #91221 from iblech/patch-dsniff2

Unbreak dsniff by partially reverting a commit to libpcap
This commit is contained in:
Matthew Bauer 2020-06-27 19:33:41 -04:00 committed by GitHub
commit cee7631c08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions

View File

@ -29,7 +29,9 @@ stdenv.mkDerivation rec {
'';
postInstall = ''
rm -f $out/lib/libpcap.a
if [ "$dontDisableStatic" -ne "1" ]; then
rm -f $out/lib/libpcap.a
fi
'';
meta = {

View File

@ -14,7 +14,7 @@ let
};
pcap = symlinkJoin {
inherit (libpcap) name;
paths = [ libpcap ];
paths = [ (libpcap.overrideAttrs(old: { dontDisableStatic = true; })) ];
postBuild = ''
cp -rs $out/include/pcap $out/include/net
# prevent references to libpcap