b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

bpftrace: pull upstream fix for binutils-2.39

Browse source 
Without the change build fails on binutils-2.39 branch as:

    jit_disasm.c:105:17: error: too few arguments to function 'init_disassemble_info'
      105 |                 init_disassemble_info(&info, stdout,
          |                 ^~~~~~~~~~~~~~~~~~~~~
This commit is contained in:
Sergei Trofimovich 2022-08-25 08:09:14 +01:00
parent b0f33ebf40
commit 67843259ad
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/os-specific/linux/bpftrace/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub
{ lib, stdenv, fetchFromGitHub, fetchpatch
, cmake, pkg-config, flex, bison
, llvmPackages, elfutils
, libbfd, libbpf, libopcodes, bcc
@ -36,6 +36,17 @@ stdenv.mkDerivation rec {
sha256 = "sha256-9adZAKSn00W2yNwVDbVB1/O5Y+10c4EkVJGCHyd4Tgg=";
};
patches = [
# Pull upstream fix for binutils-2.39:
# https://github.com/iovisor/bpftrace/pull/2328
(fetchpatch {
name = "binutils-2.39.patch";
url = "https://github.com/iovisor/bpftrace/commit/3be6e708d514d3378a4fe985ab907643ecbc77ee.patch";
sha256 = "sha256-WWEh8ViGw8053nEG/29KeKEHV5ossWPtL/AAV/l+pnY=";
excludes = [ "CHANGELOG.md" ];
})
];
buildInputs = with llvmPackages;
[ llvm libclang
elfutils bcc