diff options
| author | Ryan Burns <rtburns@protonmail.com> | 2021-09-18 15:53:11 -0700 |
|---|---|---|
| committer | Ryan Burns <rtburns@protonmail.com> | 2021-09-18 16:26:16 -0700 |
| commit | 88b8df5c21b7a081a58751466da5b1b248cae68d (patch) | |
| tree | f85974d1e48f01f1f991b71e4cc2b46d2f4203e4 /pkgs/os-specific/linux/bcc | |
| parent | 48bf1250a87792e993f875de8dac01134819b3c9 (diff) | |
| download | nixpkgs-88b8df5c21b7a081a58751466da5b1b248cae68d.tar nixpkgs-88b8df5c21b7a081a58751466da5b1b248cae68d.tar.gz nixpkgs-88b8df5c21b7a081a58751466da5b1b248cae68d.tar.bz2 nixpkgs-88b8df5c21b7a081a58751466da5b1b248cae68d.tar.lz nixpkgs-88b8df5c21b7a081a58751466da5b1b248cae68d.tar.xz nixpkgs-88b8df5c21b7a081a58751466da5b1b248cae68d.tar.zst nixpkgs-88b8df5c21b7a081a58751466da5b1b248cae68d.zip | |
linuxPackages.bcc: fix build
Use Debian downstream patch to fix compilation against linuxHeaders < 5.14. Our linux headers exposed by glibc are still at 5.12. We should be able to remove this patch once our linuxHeaders are bumped to 5.14+.
Diffstat (limited to 'pkgs/os-specific/linux/bcc')
| -rw-r--r-- | pkgs/os-specific/linux/bcc/default.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index 221f38faa87..929981df470 100644 --- a/pkgs/os-specific/linux/bcc/default.nix +++ b/pkgs/os-specific/linux/bcc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub, fetchpatch , makeWrapper, cmake, llvmPackages, kernel , flex, bison, elfutils, python, luajit, netperf, iperf, libelf , systemtap, bash, libbpf @@ -29,6 +29,12 @@ python.pkgs.buildPythonApplication rec { # This is needed until we fix # https://github.com/NixOS/nixpkgs/issues/40427 ./fix-deadlock-detector-import.patch + # Add definition for BTF_KIND_FLOAT, added in Linux 5.14 + # Can be removed once linuxHeaders (used here via glibc) are bumped to 5.14+. + (fetchpatch { + url = "https://salsa.debian.org/debian/bpfcc/-/raw/71136ef5b66a2ecefd635a7aca2e0e835ff09095/debian/patches/0004-compat-defs.patch"; + sha256 = "05s1zxihwkvbl2r2mqc5dj7fpcipqyvwr11v8b9hqbwjkm3qpz40"; + }) ]; propagatedBuildInputs = [ python.pkgs.netaddr ]; |