bcc: add systemtap dep, and fix build revision

Signed-off-by: Austin Seipp <aseipp@pobox.com>

+10 -2
+10 -2
pkgs/os-specific/linux/bcc/default.nix
··· 1 1 { stdenv, fetchFromGitHub, fetchpatch, makeWrapper, cmake, llvmPackages, kernel 2 - , flex, bison, elfutils, python, pythonPackages, luajit, netperf, iperf, libelf }: 2 + , flex, bison, elfutils, python, pythonPackages, luajit, netperf, iperf, libelf 3 + , systemtap 4 + }: 3 5 4 6 stdenv.mkDerivation rec { 5 7 version = "0.5.0"; ··· 15 17 buildInputs = [ 16 18 llvmPackages.llvm llvmPackages.clang-unwrapped kernel 17 19 elfutils python pythonPackages.netaddr luajit netperf iperf 20 + systemtap.stapBuild 18 21 ]; 19 22 20 23 patches = [ ··· 29 32 # libelf is incompatible with elfutils-libelf 30 33 ++ stdenv.lib.filter (x: x != libelf) kernel.moduleBuildDependencies; 31 34 32 - cmakeFlags="-DBCC_KERNEL_MODULES_DIR=${kernel.dev}/lib/modules"; 35 + cmakeFlags = 36 + [ "-DBCC_KERNEL_MODULES_DIR=${kernel.dev}/lib/modules" 37 + "-DREVISION=${version}" 38 + "-DENABLE_USDT=ON" 39 + "-DENABLE_CPP_API=ON" 40 + ]; 33 41 34 42 postInstall = '' 35 43 mkdir -p $out/bin $out/share