ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-20 00:53:12 +03:00
Code Issues Projects Releases Wiki Activity

bpftrace: 0.17.1 -> 0.18.0

Browse Source 
- Add patch to fix build
- While we're here uniformize style a bit, so there's lot of fluff,
but it's really just version bump + patch...
This commit is contained in:
Dominique Martinet 2023-05-19 21:03:26 +09:00 committed by Austin Seipp
parent 6ef1311212
commit a2b91c07c3
1 changed files with 36 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,42 +1,56 @@
{ lib, stdenv, fetchFromGitHub
, cmake, pkg-config, flex, bison
, llvmPackages, elfutils
, libbfd, libbpf, libopcodes, bcc
{ lib, stdenv, fetchFromGitHub, fetchpatch
, llvmPackages, elfutils, bcc
, libbpf, libbfd, libopcodes
, cereal, asciidoctor
, nixosTests
, cmake, pkg-config, flex, bison
, util-linux
, nixosTests
}:
stdenv.mkDerivation rec {
pname = "bpftrace";
version = "0.17.1";
version = "0.18.0";
src = fetchFromGitHub {
owner = "iovisor";
repo = "bpftrace";
rev = "v${version}";
sha256 = "sha256-dEchHXZPWc+/Dui6P65EqxB8O/M7F47PZVsKSp80oXE=";
owner = "iovisor";
repo = "bpftrace";
rev = "v${version}";
hash = "sha256-+SBLcMyOf1gZN8dG5xkNLsqIcK1eVlswjY1GRXepFVg=";
};
buildInputs = with llvmPackages;
[ llvm libclang
elfutils bcc
libbpf libbfd libopcodes
cereal asciidoctor
];
patches = [
# fails to build - https://github.com/iovisor/bpftrace/issues/2598
(fetchpatch {
name = "link-binaries-against-zlib";
url = "https://github.com/iovisor/bpftrace/commit/a60b171eb288250c3f1d6f065b05d8a87aff3cdd.patch";
hash = "sha256-b/0pKDjolo2RQ/UGjEfmWdG0tnIiFX8PJHhRCXvzyxA=";
})
];
nativeBuildInputs = [ cmake pkg-config flex bison llvmPackages.llvm.dev util-linux ];
buildInputs = with llvmPackages; [
llvm libclang
elfutils bcc
libbpf libbfd libopcodes
cereal asciidoctor
];
nativeBuildInputs = [
cmake pkg-config flex bison
llvmPackages.llvm.dev
util-linux
];
# tests aren't built, due to gtest shenanigans. see:
#
# https://github.com/iovisor/bpftrace/issues/161#issuecomment-453606728
# https://github.com/iovisor/bpftrace/pull/363
#
cmakeFlags =
[ "-DBUILD_TESTING=FALSE"
"-DLIBBCC_INCLUDE_DIRS=${bcc}/include"
"-DINSTALL_TOOL_DOCS=off"
];
cmakeFlags = [
"-DBUILD_TESTING=FALSE"
"-DLIBBCC_INCLUDE_DIRS=${bcc}/include"
"-DINSTALL_TOOL_DOCS=OFF"
"-DUSE_SYSTEM_BPF_BCC=ON"
];
# Pull BPF scripts into $PATH (next to their bcc program equivalents), but do
# not move them to keep `${pkgs.bpftrace}/share/bpftrace/tools/...` working.