ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-29 00:27:49 +03:00
Code Issues Projects Releases Wiki Activity

linuxPackages.bpftrace: 0.9.4 -> 0.11.0

Browse Source 
This fixes the `bcc` include directory (which was improperly set, and
warned about at build-time, but masked by some backwards compat code,
apparently) and also includes some missing libraries in `buildInputs`

Signed-off-by: Austin Seipp <aseipp@pobox.com>
This commit is contained in:
Austin Seipp 2020-08-31 17:40:18 -05:00
parent 5e91e66591
commit 6fb7b16046
No known key found for this signature in database
GPG Key ID: 25D2038DEB08021D
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/os-specific/linux/bpftrace/default.nix
View File

@ -1,17 +1,18 @@
{ stdenv, fetchFromGitHub { stdenv, fetchFromGitHub
, cmake, pkgconfig, flex, bison , cmake, pkgconfig, flex, bison
, llvmPackages, kernel, elfutils, libelf, bcc , llvmPackages, kernel, elfutils
, libelf, libbfd, libbpf, libopcodes, bcc
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "bpftrace"; pname = "bpftrace";
version = "0.9.4"; version = "0.11.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "iovisor"; owner = "iovisor";
repo = "bpftrace"; repo = "bpftrace";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
sha256 = "00fvkq3razwacnpb82zkpv63dgyigbqx3gj6g0ka94nwa74i5i77"; sha256 = "02f2r731yj3fdc8341id1ksk4dma9rwm2765n2xgx2ldrrz5823y";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;
@ -19,6 +20,7 @@ stdenv.mkDerivation rec {
buildInputs = with llvmPackages; buildInputs = with llvmPackages;
[ llvm clang-unwrapped [ llvm clang-unwrapped
kernel elfutils libelf bcc kernel elfutils libelf bcc
libbpf libbfd libopcodes
]; ];
nativeBuildInputs = [ cmake pkgconfig flex bison ] nativeBuildInputs = [ cmake pkgconfig flex bison ]
@ -41,7 +43,7 @@ stdenv.mkDerivation rec {
# #
cmakeFlags = cmakeFlags =
[ "-DBUILD_TESTING=FALSE" [ "-DBUILD_TESTING=FALSE"
"-DLIBBCC_INCLUDE_DIRS=${bcc}/include/bcc" "-DLIBBCC_INCLUDE_DIRS=${bcc}/include"
]; ];
# nuke the example/reference output .txt files, for the included tools, # nuke the example/reference output .txt files, for the included tools,