git.iko.soy/typeable/nixpkgs
on master help sign in
linuxPackages.bpftrace: 0.9.4 -> 0.11.0

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>

commit6fb7b160467dc5da322af42d26458292ddc88fbc authorAustin Seipp <aseipp@pobox.com> dateMon 31 Aug 2020, 17:40 (6 years ago) parent5e91e66
1 file changed+6−4
pkgs/os-specific/linux/bpftrace/default.nix+6−4
pkgs/os-specific/linux/bpftrace/default.nix+6−4
@@ -1,17 +1,18 @@
11{ stdenv, fetchFromGitHub
22, cmake, pkgconfig, flex, bison
3−, llvmPackages, kernel, elfutils, libelf, bcc
3+, llvmPackages, kernel, elfutils
4+, libelf, libbfd, libbpf, libopcodes, bcc
45}:
56
67stdenv.mkDerivation rec {
78 pname = "bpftrace";
8− version = "0.9.4";
9+ version = "0.11.0";
910
1011 src = fetchFromGitHub {
1112 owner = "iovisor";
1213 repo = "bpftrace";
1314 rev = "refs/tags/v${version}";
14− sha256 = "00fvkq3razwacnpb82zkpv63dgyigbqx3gj6g0ka94nwa74i5i77";
15+ sha256 = "02f2r731yj3fdc8341id1ksk4dma9rwm2765n2xgx2ldrrz5823y";
1516 };
1617
1718 enableParallelBuilding = true;
@@ -19,6 +20,7 @@ stdenv.mkDerivation rec {
1920 buildInputs = with llvmPackages;
2021 [ llvm clang-unwrapped
2122 kernel elfutils libelf bcc
23+ libbpf libbfd libopcodes
2224 ];
2325
2426 nativeBuildInputs = [ cmake pkgconfig flex bison ]
@@ -41,7 +43,7 @@ stdenv.mkDerivation rec {
4143 #
4244 cmakeFlags =
4345 [ "-DBUILD_TESTING=FALSE"
44− "-DLIBBCC_INCLUDE_DIRS=${bcc}/include/bcc"
46+ "-DLIBBCC_INCLUDE_DIRS=${bcc}/include"
4547 ];
4648
4749 # nuke the example/reference output .txt files, for the included tools,