Commit a2b91c07 authored by Dominique Martinet's avatar Dominique Martinet Committed by Austin Seipp
Browse files

bpftrace: 0.17.1 -> 0.18.0 

- 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...
parent 6ef13112

pkgs/os-specific/linux/bpftrace/default.nix

+36 −22
Original line number Diff line number Diff line 
{ 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=";

    hash  = "sha256-+SBLcMyOf1gZN8dG5xkNLsqIcK1eVlswjY1GRXepFVg=";

  };



  buildInputs = with llvmPackages;

    [ llvm libclang

  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=";

    })

  ];



  buildInputs = with llvmPackages; [

    llvm libclang

    elfutils bcc

    libbpf libbfd libopcodes

    cereal asciidoctor

  ];



  nativeBuildInputs = [ cmake pkg-config flex bison llvmPackages.llvm.dev util-linux ];

  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"

  cmakeFlags = [

    "-DBUILD_TESTING=FALSE"

    "-DLIBBCC_INCLUDE_DIRS=${bcc}/include"

      "-DINSTALL_TOOL_DOCS=off"

    "-DINSTALL_TOOL_DOCS=OFF"

    "-DUSE_SYSTEM_BPF_BCC=ON"

  ];



  # Pull BPF scripts into $PATH (next to their bcc program equivalents), but do