about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorOrivej Desh <orivej@gmx.fr>2017-12-16 21:42:36 +0000
committerGitHub <noreply@github.com>2017-12-16 21:42:36 +0000
commitee03ae2c414eb60e221491f133fc135a1245bd30 (patch)
treedc097b9f4d86761320a1bc92f2cb69715dcc093f /pkgs
parent556370ddcae563c01f79af1ef32ae3db256c6496 (diff)
parentf856f3bf232fc935e3a80f0e7bad0747d0e4017b (diff)
downloadnixlib-ee03ae2c414eb60e221491f133fc135a1245bd30.tar
nixlib-ee03ae2c414eb60e221491f133fc135a1245bd30.tar.gz
nixlib-ee03ae2c414eb60e221491f133fc135a1245bd30.tar.bz2
nixlib-ee03ae2c414eb60e221491f133fc135a1245bd30.tar.lz
nixlib-ee03ae2c414eb60e221491f133fc135a1245bd30.tar.xz
nixlib-ee03ae2c414eb60e221491f133fc135a1245bd30.tar.zst
nixlib-ee03ae2c414eb60e221491f133fc135a1245bd30.zip
Merge pull request #32739 from jtojnar/libpcap-nolimit
libpcap: increase maximum snapshot length for dbus
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/libraries/libpcap/default.nix9
1 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix
index 0cd9d758725c..bef5f9a9da34 100644
--- a/pkgs/development/libraries/libpcap/default.nix
+++ b/pkgs/development/libraries/libpcap/default.nix
@@ -26,6 +26,15 @@ stdenv.mkDerivation rec {
       url    = "https://sources.debian.net/data/main/libp/libpcap/1.8.1-3/debian/patches/disable-remote.diff";
       sha256 = "0dvjax9c0spvq8cdjnkbnm65wlzaml259yragf95kzg611vszfmj";
     })
+    # See https://github.com/wjt/bustle/commit/f62cf6bfa662af4ae39effbbd4891bc619e3b4e9
+    (fetchpatch {
+      url    = "https://github.com/the-tcpdump-group/libpcap/commit/2be9c29d45fb1fab8e9549342a30c160b7dea3e1.patch";
+      sha256 = "1g8mh942vr0abn48g0bdvi4gmhq1bz0l80276603y7064qhy3wq5";
+    })
+    (fetchpatch {
+      url    = "https://github.com/the-tcpdump-group/libpcap/commit/1a6b088a88886eac782008f37a7219a32b86da45.patch";
+      sha256 = "1n5ylm7ch3i1lh4y2q16b0vabgym8g8mqiqxpqcdkjdn05c1wflr";
+    })
   ];
 
   preInstall = ''mkdir -p $out/bin'';