mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-22 05:19:00 +02:00
bcc: remove submodule
reverting libbpf back to 0.5.0 fixes bcc compilation with our libbpf This also shows this was a libbpf bug rather than a bcc problem...
This commit is contained in:
parent
0ae1623ea3
commit
2318433b73
|
@ -1,7 +1,7 @@
|
||||||
{ lib, stdenv, fetchFromGitHub
|
{ lib, stdenv, fetchFromGitHub
|
||||||
, makeWrapper, cmake, llvmPackages
|
, makeWrapper, cmake, llvmPackages
|
||||||
, flex, bison, elfutils, python, luajit, netperf, iperf, libelf
|
, flex, bison, elfutils, python, luajit, netperf, iperf, libelf
|
||||||
, bash
|
, bash, libbpf
|
||||||
}:
|
}:
|
||||||
|
|
||||||
python.pkgs.buildPythonApplication rec {
|
python.pkgs.buildPythonApplication rec {
|
||||||
|
@ -14,15 +14,14 @@ python.pkgs.buildPythonApplication rec {
|
||||||
owner = "iovisor";
|
owner = "iovisor";
|
||||||
repo = "bcc";
|
repo = "bcc";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-4zfjr3VLg26uZ4xNKA1wayti7f2tqGvYSbwoZnr+Ygk=";
|
sha256 = "sha256-iLVUwJTDQ8Bn38sgHOcIR8TYxIB+gIlfTgr9+gPU0gE=";
|
||||||
fetchSubmodules = true;
|
|
||||||
};
|
};
|
||||||
format = "other";
|
format = "other";
|
||||||
|
|
||||||
buildInputs = with llvmPackages; [
|
buildInputs = with llvmPackages; [
|
||||||
llvm llvm.dev libclang
|
llvm llvm.dev libclang
|
||||||
elfutils luajit netperf iperf
|
elfutils luajit netperf iperf
|
||||||
flex bash
|
flex bash libbpf
|
||||||
];
|
];
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
@ -39,6 +38,7 @@ python.pkgs.buildPythonApplication rec {
|
||||||
"-DREVISION=${version}"
|
"-DREVISION=${version}"
|
||||||
"-DENABLE_USDT=ON"
|
"-DENABLE_USDT=ON"
|
||||||
"-DENABLE_CPP_API=ON"
|
"-DENABLE_CPP_API=ON"
|
||||||
|
"-DCMAKE_USE_LIBBPF_PACKAGE=ON"
|
||||||
];
|
];
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
@ -73,6 +73,6 @@ python.pkgs.buildPythonApplication rec {
|
||||||
description = "Dynamic Tracing Tools for Linux";
|
description = "Dynamic Tracing Tools for Linux";
|
||||||
homepage = "https://iovisor.github.io/bcc/";
|
homepage = "https://iovisor.github.io/bcc/";
|
||||||
license = licenses.asl20;
|
license = licenses.asl20;
|
||||||
maintainers = with maintainers; [ ragge mic92 thoughtpolice ];
|
maintainers = with maintainers; [ ragge mic92 thoughtpolice martinetd ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue