summary refs log tree commit diff
path: root/pkgs/os-specific/linux/bcc
diff options
context:
space:
mode:
authorAustin Seipp <aseipp@pobox.com>2020-08-31 17:46:14 -0500
committerAustin Seipp <aseipp@pobox.com>2020-08-31 17:54:19 -0500
commit58bb6bf73a9177d2578f3856858aa2464338372a (patch)
tree1ada7aa036a790b3b111e411605a37aba53403ce /pkgs/os-specific/linux/bcc
parent6fb7b160467dc5da322af42d26458292ddc88fbc (diff)
downloadnixpkgs-58bb6bf73a9177d2578f3856858aa2464338372a.tar
nixpkgs-58bb6bf73a9177d2578f3856858aa2464338372a.tar.gz
nixpkgs-58bb6bf73a9177d2578f3856858aa2464338372a.tar.bz2
nixpkgs-58bb6bf73a9177d2578f3856858aa2464338372a.tar.lz
nixpkgs-58bb6bf73a9177d2578f3856858aa2464338372a.tar.xz
nixpkgs-58bb6bf73a9177d2578f3856858aa2464338372a.tar.zst
nixpkgs-58bb6bf73a9177d2578f3856858aa2464338372a.zip
linuxPackages.bcc: patch trace buffer bug in python library
Signed-off-by: Austin Seipp <aseipp@pobox.com>
Diffstat (limited to 'pkgs/os-specific/linux/bcc')
-rw-r--r--pkgs/os-specific/linux/bcc/default.nix9
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix
index f8e9a4135a3..de02ffb30a3 100644
--- a/pkgs/os-specific/linux/bcc/default.nix
+++ b/pkgs/os-specific/linux/bcc/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, makeWrapper, cmake, llvmPackages, kernel
+{ stdenv, fetchurl, fetchpatch
+, makeWrapper, cmake, llvmPackages, kernel
 , flex, bison, elfutils, python, luajit, netperf, iperf, libelf
 , systemtap, bash
 }:
@@ -23,6 +24,12 @@ python.pkgs.buildPythonApplication rec {
     # This is needed until we fix
     # https://github.com/NixOS/nixpkgs/issues/40427
     ./fix-deadlock-detector-import.patch
+
+    # This is already upstream; remove it on the next release
+    (fetchpatch {
+      url = "https://github.com/iovisor/bcc/commit/60de17161fe7f44b534a8da343edbad2427220e3.patch";
+      sha256 = "0pd5b4vgpdxbsrjwrw2kmn4l9hpj0rwdm3hvwvk7dsr3raz7w4b3";
+    })
   ];
 
   propagatedBuildInputs = [ python.pkgs.netaddr ];