diff options
| author | Dominique Martinet <asmadeus@codewreck.org> | 2021-12-04 09:22:45 +0900 |
|---|---|---|
| committer | Dominique Martinet <asmadeus@codewreck.org> | 2021-12-04 21:12:07 +0900 |
| commit | 2318433b7388444c67a54cc79a9d7baf7df27e26 (patch) | |
| tree | ba5afb0418349b1569c27ce66dbec877023ee1d2 /pkgs/os-specific/linux/bcc | |
| parent | 0ae1623ea3f146b07477a8e81d6bbcef23ea91f0 (diff) | |
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...
Diffstat (limited to 'pkgs/os-specific/linux/bcc')
| -rw-r--r-- | pkgs/os-specific/linux/bcc/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index 4e8f28a0eda1c..7033329b9b394 100644 --- a/pkgs/os-specific/linux/bcc/default.nix +++ b/pkgs/os-specific/linux/bcc/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub , makeWrapper, cmake, llvmPackages , flex, bison, elfutils, python, luajit, netperf, iperf, libelf -, bash +, bash, libbpf }: python.pkgs.buildPythonApplication rec { @@ -14,15 +14,14 @@ python.pkgs.buildPythonApplication rec { owner = "iovisor"; repo = "bcc"; rev = "v${version}"; - sha256 = "sha256-4zfjr3VLg26uZ4xNKA1wayti7f2tqGvYSbwoZnr+Ygk="; - fetchSubmodules = true; + sha256 = "sha256-iLVUwJTDQ8Bn38sgHOcIR8TYxIB+gIlfTgr9+gPU0gE="; }; format = "other"; buildInputs = with llvmPackages; [ llvm llvm.dev libclang elfutils luajit netperf iperf - flex bash + flex bash libbpf ]; patches = [ @@ -39,6 +38,7 @@ python.pkgs.buildPythonApplication rec { "-DREVISION=${version}" "-DENABLE_USDT=ON" "-DENABLE_CPP_API=ON" + "-DCMAKE_USE_LIBBPF_PACKAGE=ON" ]; postPatch = '' @@ -73,6 +73,6 @@ python.pkgs.buildPythonApplication rec { description = "Dynamic Tracing Tools for Linux"; homepage = "https://iovisor.github.io/bcc/"; license = licenses.asl20; - maintainers = with maintainers; [ ragge mic92 thoughtpolice ]; + maintainers = with maintainers; [ ragge mic92 thoughtpolice martinetd ]; }; } |