cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

linuxPackages.bcc: fix build

Browse source 
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+.
This commit is contained in:
Ryan Burns 2021-09-18 15:53:11 -07:00
parent 48bf1250a8
commit 88b8df5c21
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/os-specific/linux/bcc/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub { lib, stdenv, fetchFromGitHub, fetchpatch
, makeWrapper, cmake, llvmPackages, kernel , makeWrapper, cmake, llvmPackages, kernel
, flex, bison, elfutils, python, luajit, netperf, iperf, libelf , flex, bison, elfutils, python, luajit, netperf, iperf, libelf
, systemtap, bash, libbpf , systemtap, bash, libbpf
@ -29,6 +29,12 @@ python.pkgs.buildPythonApplication rec {
# This is needed until we fix # This is needed until we fix
# https://github.com/NixOS/nixpkgs/issues/40427 # https://github.com/NixOS/nixpkgs/issues/40427
./fix-deadlock-detector-import.patch ./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 ]; propagatedBuildInputs = [ python.pkgs.netaddr ];