diff options
Diffstat (limited to 'pkgs/os-specific/linux/bcc/default.nix')
-rw-r--r-- | pkgs/os-specific/linux/bcc/default.nix | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index 98de3ed1b11..221f38faa87 100644 --- a/pkgs/os-specific/linux/bcc/default.nix +++ b/pkgs/os-specific/linux/bcc/default.nix @@ -1,22 +1,28 @@ -{ stdenv, fetchurl, makeWrapper, cmake, llvmPackages, kernel +{ lib, stdenv, fetchFromGitHub +, makeWrapper, cmake, llvmPackages, kernel , flex, bison, elfutils, python, luajit, netperf, iperf, libelf -, systemtap, bash +, systemtap, bash, libbpf }: python.pkgs.buildPythonApplication rec { pname = "bcc"; - version = "0.15.0"; + version = "0.20.0"; - src = fetchurl { - url = "https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz"; - sha256 = "1k00xbhdzdvqp4hfxpgg34bbhnx597jjhpg1x6dz2w80r7xzsj28"; + disabled = !stdenv.isLinux; + + src = fetchFromGitHub { + owner = "iovisor"; + repo = "bcc"; + rev = "v${version}"; + sha256 = "1xnpz2zv445dp5h0160drv6xlvrnwfj23ngc4dp3clcd59jh1baq"; }; format = "other"; buildInputs = with llvmPackages; [ - llvm clang-unwrapped kernel + llvm llvm.dev libclang kernel elfutils luajit netperf iperf systemtap.stapBuild flex bash + libbpf ]; patches = [ @@ -26,15 +32,16 @@ python.pkgs.buildPythonApplication rec { ]; propagatedBuildInputs = [ python.pkgs.netaddr ]; - nativeBuildInputs = [ makeWrapper cmake flex bison ] + nativeBuildInputs = [ makeWrapper cmake flex bison llvmPackages.llvm.dev ] # libelf is incompatible with elfutils-libelf - ++ stdenv.lib.filter (x: x != libelf) kernel.moduleBuildDependencies; + ++ lib.filter (x: x != libelf) kernel.moduleBuildDependencies; cmakeFlags = [ "-DBCC_KERNEL_MODULES_DIR=${kernel.dev}/lib/modules" "-DREVISION=${version}" "-DENABLE_USDT=ON" "-DENABLE_CPP_API=ON" + "-DCMAKE_USE_LIBBPF_PACKAGE=ON" ]; postPatch = '' @@ -65,7 +72,7 @@ python.pkgs.buildPythonApplication rec { wrapPythonProgramsIn "$out/share/bcc/tools" "$out $pythonPath" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Dynamic Tracing Tools for Linux"; homepage = "https://iovisor.github.io/bcc/"; license = licenses.asl20; |