swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 21:09:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

bcc: remove submodule

Browse source 
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:
Dominique Martinet 2021-12-04 09:22:45 +09:00
parent 0ae1623ea3
commit 2318433b73
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/os-specific/linux/bcc/default.nix
View file

@ -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 ];
};
}