diff options
| author | Will Dietz <w@wdtz.org> | 2018-12-30 17:15:33 -0600 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2018-12-30 17:18:20 -0600 |
| commit | 4934e2b77968f1fe764c142372e5785e8674c284 (patch) | |
| tree | f6df7449b27327882de3df2c15bcfdd9d595f9c3 /pkgs/development/libraries/libpcap | |
| parent | 7bf70fe520bc203e1590c75a23ec2baeeceb719b (diff) | |
| download | nixpkgs-4934e2b77968f1fe764c142372e5785e8674c284.tar nixpkgs-4934e2b77968f1fe764c142372e5785e8674c284.tar.gz nixpkgs-4934e2b77968f1fe764c142372e5785e8674c284.tar.bz2 nixpkgs-4934e2b77968f1fe764c142372e5785e8674c284.tar.lz nixpkgs-4934e2b77968f1fe764c142372e5785e8674c284.tar.xz nixpkgs-4934e2b77968f1fe764c142372e5785e8674c284.tar.zst nixpkgs-4934e2b77968f1fe764c142372e5785e8674c284.zip | |
libpcap: prefer patch over sed, fetch it and mention upstream PR
Diffstat (limited to 'pkgs/development/libraries/libpcap')
| -rw-r--r-- | pkgs/development/libraries/libpcap/default.nix | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix index a12fae7082a..f7cbfeab470 100644 --- a/pkgs/development/libraries/libpcap/default.nix +++ b/pkgs/development/libraries/libpcap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, flex, bison }: +{ stdenv, fetchurl, fetchpatch, flex, bison }: stdenv.mkDerivation rec { name = "libpcap-1.9.0"; @@ -25,11 +25,16 @@ stdenv.mkDerivation rec { prePatch = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace configure --replace " -arch i386" "" - '' + '' - sed -i '1i#include <limits.h>' pcap-usb-linux.c ''; - preInstall = ''mkdir -p $out/bin''; + patches = [ + # https://github.com/the-tcpdump-group/libpcap/pull/735 + (fetchpatch { + name = "add-missing-limits-h-include-pr735.patch"; + url = https://github.com/the-tcpdump-group/libpcap/commit/aafa3512b7b742f5e66a5543e41974cc5e7eebfa.patch; + sha256 = "05zb4hx9g24gx07bi02rprk2rn7fdc1ss3249dv5x36qkasnfhvf"; + }) + ]; meta = with stdenv.lib; { homepage = https://www.tcpdump.org; |