From 7bf70fe520bc203e1590c75a23ec2baeeceb719b Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 19 Dec 2018 11:59:58 -0600
Subject: [PATCH 1/2] pcap: Add missing include, fix w/musl

---
 pkgs/development/libraries/libpcap/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix
index 62b8126dbc7..a12fae7082a 100644
--- a/pkgs/development/libraries/libpcap/default.nix
+++ b/pkgs/development/libraries/libpcap/default.nix
@@ -25,6 +25,8 @@ 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'';

From 4934e2b77968f1fe764c142372e5785e8674c284 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sun, 30 Dec 2018 17:15:33 -0600
Subject: [PATCH 2/2] libpcap: prefer patch over sed, fetch it and mention
 upstream PR

---
 pkgs/development/libraries/libpcap/default.nix | 13 +++++++++----
 1 file 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;