JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #91221 from iblech/patch-dsniff2

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/libpcap/default.nix
View File

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

2
pkgs/tools/networking/dsniff/default.nix
View File

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