diff options
author | Austin Seipp <aseipp@pobox.com> | 2020-08-31 17:40:18 -0500 |
---|---|---|
committer | Austin Seipp <aseipp@pobox.com> | 2020-08-31 17:47:30 -0500 |
commit | 6fb7b160467dc5da322af42d26458292ddc88fbc (patch) | |
tree | bc65413f17c38b9af97916df1870a2948621fc33 | |
parent | 5e91e66591cbd745924185702fcf0f9c7283b213 (diff) | |
download | nixpkgs-6fb7b160467dc5da322af42d26458292ddc88fbc.tar nixpkgs-6fb7b160467dc5da322af42d26458292ddc88fbc.tar.gz nixpkgs-6fb7b160467dc5da322af42d26458292ddc88fbc.tar.bz2 nixpkgs-6fb7b160467dc5da322af42d26458292ddc88fbc.tar.lz nixpkgs-6fb7b160467dc5da322af42d26458292ddc88fbc.tar.xz nixpkgs-6fb7b160467dc5da322af42d26458292ddc88fbc.tar.zst nixpkgs-6fb7b160467dc5da322af42d26458292ddc88fbc.zip |
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>
-rw-r--r-- | pkgs/os-specific/linux/bpftrace/default.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/bpftrace/default.nix b/pkgs/os-specific/linux/bpftrace/default.nix index 0c360e60b7e..fc7c8ecba2d 100644 --- a/pkgs/os-specific/linux/bpftrace/default.nix +++ b/pkgs/os-specific/linux/bpftrace/default.nix @@ -1,17 +1,18 @@ { stdenv, fetchFromGitHub , cmake, pkgconfig, flex, bison -, llvmPackages, kernel, elfutils, libelf, bcc +, llvmPackages, kernel, elfutils +, libelf, libbfd, libbpf, libopcodes, bcc }: stdenv.mkDerivation rec { pname = "bpftrace"; - version = "0.9.4"; + version = "0.11.0"; src = fetchFromGitHub { owner = "iovisor"; repo = "bpftrace"; rev = "refs/tags/v${version}"; - sha256 = "00fvkq3razwacnpb82zkpv63dgyigbqx3gj6g0ka94nwa74i5i77"; + sha256 = "02f2r731yj3fdc8341id1ksk4dma9rwm2765n2xgx2ldrrz5823y"; }; enableParallelBuilding = true; @@ -19,6 +20,7 @@ stdenv.mkDerivation rec { buildInputs = with llvmPackages; [ llvm clang-unwrapped kernel elfutils libelf bcc + libbpf libbfd libopcodes ]; nativeBuildInputs = [ cmake pkgconfig flex bison ] @@ -41,7 +43,7 @@ stdenv.mkDerivation rec { # cmakeFlags = [ "-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, |