bcc: add systemtap dep, and fix build revision
Signed-off-by: Austin Seipp <aseipp@pobox.com>
This commit is contained in:
parent
38bc86ac6c
commit
4166691813
|
@ -1,5 +1,7 @@
|
||||||
{ stdenv, fetchFromGitHub, fetchpatch, makeWrapper, cmake, llvmPackages, kernel
|
{ stdenv, fetchFromGitHub, fetchpatch, makeWrapper, cmake, llvmPackages, kernel
|
||||||
, flex, bison, elfutils, python, pythonPackages, luajit, netperf, iperf, libelf }:
|
, flex, bison, elfutils, python, pythonPackages, luajit, netperf, iperf, libelf
|
||||||
|
, systemtap
|
||||||
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "0.5.0";
|
version = "0.5.0";
|
||||||
|
@ -15,6 +17,7 @@ stdenv.mkDerivation rec {
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
llvmPackages.llvm llvmPackages.clang-unwrapped kernel
|
llvmPackages.llvm llvmPackages.clang-unwrapped kernel
|
||||||
elfutils python pythonPackages.netaddr luajit netperf iperf
|
elfutils python pythonPackages.netaddr luajit netperf iperf
|
||||||
|
systemtap.stapBuild
|
||||||
];
|
];
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
@ -29,7 +32,12 @@ stdenv.mkDerivation rec {
|
||||||
# libelf is incompatible with elfutils-libelf
|
# libelf is incompatible with elfutils-libelf
|
||||||
++ stdenv.lib.filter (x: x != libelf) kernel.moduleBuildDependencies;
|
++ stdenv.lib.filter (x: x != libelf) kernel.moduleBuildDependencies;
|
||||||
|
|
||||||
cmakeFlags="-DBCC_KERNEL_MODULES_DIR=${kernel.dev}/lib/modules";
|
cmakeFlags =
|
||||||
|
[ "-DBCC_KERNEL_MODULES_DIR=${kernel.dev}/lib/modules"
|
||||||
|
"-DREVISION=${version}"
|
||||||
|
"-DENABLE_USDT=ON"
|
||||||
|
"-DENABLE_CPP_API=ON"
|
||||||
|
];
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
mkdir -p $out/bin $out/share
|
mkdir -p $out/bin $out/share
|
||||||
|
|
Loading…
Reference in a new issue