BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

libbpf: 0.6.1 -> 0.7.0

Browse source 
- remove patch that had been merged since
- install all uapi headers, not just btf, as new version of bcc
  requires some more
This commit is contained in:
Dominique Martinet 2022-02-11 16:54:53 +09:00
parent 4521b84d49
commit 6108c057dd
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/os-specific/linux/libbpf/default.nix
View file

@ -12,20 +12,15 @@ with builtins;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libbpf"; pname = "libbpf";
version = "0.6.1"; version = "0.7.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "libbpf"; owner = "libbpf";
repo = "libbpf"; repo = "libbpf";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-/MLPflnfooe7Wjy8M3CTowAi5oYpscruSkDsaVzhmYQ="; sha256 = "sha256-ieJ19igGCoPKGX6J0mQG+QD7QcXHX2SVzZUjMwxum/M=";
}; };
patches = [(fetchpatch {
url = "https://github.com/libbpf/libbpf/pull/41.diff";
sha256 = "sha256-pg5WARqh6z0nkTHMBhftxwdV2SyswC2lfaCXCpez0VA=";
})];
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ libelf zlib ]; buildInputs = [ libelf zlib ];
@ -38,7 +33,7 @@ stdenv.mkDerivation rec {
postInstall = '' postInstall = ''
# install linux's libbpf-compatible linux/btf.h # install linux's libbpf-compatible linux/btf.h
install -Dm444 include/uapi/linux/btf.h -t $out/include/linux install -Dm444 include/uapi/linux/*.h -t $out/include/linux
''; '';
# FIXME: Multi-output requires some fixes to the way the pkg-config file is # FIXME: Multi-output requires some fixes to the way the pkg-config file is