jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #188261 from trofi/bpftrace-fix-for-binutils-2.39

Browse Source 
bpftrace: pull upstream fix for binutils-2.39
This commit is contained in:
Bernardo Meurer 2022-08-25 10:13:13 -03:00 committed by GitHub
commit 20c8ddc903
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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