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

Revert "linuxPackages.bcc: fix build"

Browse Source 
This reverts commit 38e5d82d59529e96b55f8a33a954d481d77287a1.
This commit is contained in:
Jörg Thalheim 2021-09-19 13:45:53 +02:00 committed by Sergei Trofimovich
parent f75b03979c
commit 3449264436
1 changed files with 1 additions and 7 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, fetchpatch
{ lib, stdenv, fetchFromGitHub
, makeWrapper, cmake, llvmPackages, kernel
, flex, bison, elfutils, python, luajit, netperf, iperf, libelf
, systemtap, bash, libbpf
@ -29,12 +29,6 @@ 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 ];