diff options
| author | Dominique Martinet <asmadeus@codewreck.org> | 2022-02-11 16:54:53 +0900 |
|---|---|---|
| committer | Dominique Martinet <asmadeus@codewreck.org> | 2022-02-11 17:00:00 +0900 |
| commit | 6108c057ddfdf18a11a755f1e187692bde1961e2 (patch) | |
| tree | 37851e220c8f0df68fce9d5604c2e8cfb6fdee4d | |
| parent | 4521b84d495d51815fa07017ca3a82cf8004891e (diff) | |
| download | nixpkgs-6108c057ddfdf18a11a755f1e187692bde1961e2.tar nixpkgs-6108c057ddfdf18a11a755f1e187692bde1961e2.tar.gz nixpkgs-6108c057ddfdf18a11a755f1e187692bde1961e2.tar.bz2 nixpkgs-6108c057ddfdf18a11a755f1e187692bde1961e2.tar.lz nixpkgs-6108c057ddfdf18a11a755f1e187692bde1961e2.tar.xz nixpkgs-6108c057ddfdf18a11a755f1e187692bde1961e2.tar.zst nixpkgs-6108c057ddfdf18a11a755f1e187692bde1961e2.zip | |
libbpf: 0.6.1 -> 0.7.0
- remove patch that had been merged since - install all uapi headers, not just btf, as new version of bcc requires some more
| -rw-r--r-- | pkgs/os-specific/linux/libbpf/default.nix | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/pkgs/os-specific/linux/libbpf/default.nix b/pkgs/os-specific/linux/libbpf/default.nix index 81e86fe77ef..f45e1847751 100644 --- a/pkgs/os-specific/linux/libbpf/default.nix +++ b/pkgs/os-specific/linux/libbpf/default.nix @@ -12,20 +12,15 @@ with builtins; stdenv.mkDerivation rec { pname = "libbpf"; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "libbpf"; repo = "libbpf"; 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 ]; buildInputs = [ libelf zlib ]; @@ -38,7 +33,7 @@ stdenv.mkDerivation rec { postInstall = '' # 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 |