pyrox.dev / nixpkgs
lol
fork atom

bpftrace: pull upstream fix for binutils-2.39

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,
| ^~~~~~~~~~~~~~~~~~~~~

Sergei Trofimovich 67843259 b0f33ebf

+12 -1
unified split
+12 -1
pkgs/os-specific/linux/bpftrace/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub 2 , cmake, pkg-config, flex, bison 3 , llvmPackages, elfutils 4 , libbfd, libbpf, libopcodes, bcc ··· 35 rev = "v${version}"; 36 sha256 = "sha256-9adZAKSn00W2yNwVDbVB1/O5Y+10c4EkVJGCHyd4Tgg="; 37 }; 38 39 buildInputs = with llvmPackages; 40 [ llvm libclang
··· 1 + { lib, stdenv, fetchFromGitHub, fetchpatch 2 , cmake, pkg-config, flex, bison 3 , llvmPackages, elfutils 4 , libbfd, libbpf, libopcodes, bcc ··· 35 rev = "v${version}"; 36 sha256 = "sha256-9adZAKSn00W2yNwVDbVB1/O5Y+10c4EkVJGCHyd4Tgg="; 37 }; 38 + 39 + patches = [ 40 + # Pull upstream fix for binutils-2.39: 41 + # https://github.com/iovisor/bpftrace/pull/2328 42 + (fetchpatch { 43 + name = "binutils-2.39.patch"; 44 + url = "https://github.com/iovisor/bpftrace/commit/3be6e708d514d3378a4fe985ab907643ecbc77ee.patch"; 45 + sha256 = "sha256-WWEh8ViGw8053nEG/29KeKEHV5ossWPtL/AAV/l+pnY="; 46 + excludes = [ "CHANGELOG.md" ]; 47 + }) 48 + ]; 49 50 buildInputs = with llvmPackages; 51 [ llvm libclang