From 58bb6bf73a9177d2578f3856858aa2464338372a Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Mon, 31 Aug 2020 17:46:14 -0500 Subject: [PATCH] linuxPackages.bcc: patch trace buffer bug in python library Signed-off-by: Austin Seipp --- pkgs/os-specific/linux/bcc/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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 ];