diff options
| author | Dominique Martinet <asmadeus@codewreck.org> | 2021-03-31 12:55:44 +0900 |
|---|---|---|
| committer | Dominique Martinet <asmadeus@codewreck.org> | 2021-03-31 12:55:44 +0900 |
| commit | e342543f885386b29ca49386a4c37b0b8135c1dc (patch) | |
| tree | e1e886a9b3a9063b51105b5cb7103b5b9bdfa98a /pkgs/os-specific/linux/bcc | |
| parent | 2b5aed09eefd70880a7586b266dd498420f437d5 (diff) | |
| download | nixpkgs-e342543f885386b29ca49386a4c37b0b8135c1dc.tar nixpkgs-e342543f885386b29ca49386a4c37b0b8135c1dc.tar.gz nixpkgs-e342543f885386b29ca49386a4c37b0b8135c1dc.tar.bz2 nixpkgs-e342543f885386b29ca49386a4c37b0b8135c1dc.tar.lz nixpkgs-e342543f885386b29ca49386a4c37b0b8135c1dc.tar.xz nixpkgs-e342543f885386b29ca49386a4c37b0b8135c1dc.tar.zst nixpkgs-e342543f885386b29ca49386a4c37b0b8135c1dc.zip | |
bcc: devendor libbpf
Diffstat (limited to 'pkgs/os-specific/linux/bcc')
| -rw-r--r-- | pkgs/os-specific/linux/bcc/default.nix | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index 290e3b56180..4235ecb38d3 100644 --- a/pkgs/os-specific/linux/bcc/default.nix +++ b/pkgs/os-specific/linux/bcc/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, fetchurl, fetchpatch +{ lib, stdenv, fetchFromGitHub , makeWrapper, cmake, llvmPackages, kernel , flex, bison, elfutils, python, luajit, netperf, iperf, libelf -, systemtap, bash +, systemtap, bash, libbpf }: python.pkgs.buildPythonApplication rec { @@ -10,9 +10,11 @@ python.pkgs.buildPythonApplication rec { disabled = !stdenv.isLinux; - src = fetchurl { - url = "https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz"; - sha256 = "sha256-TEH8Gmp+8ghLQ8UsGy5hBCMLqfMeApWEFr8THYSOdOQ="; + src = fetchFromGitHub { + owner = "iovisor"; + repo = "bcc"; + rev = "v${version}"; + sha256 = "sha256:0k807vzznlb2icczw64ph6q28605kvghya2kd4h3c7jmap6gq1qg"; }; format = "other"; @@ -20,6 +22,7 @@ python.pkgs.buildPythonApplication rec { llvm clang-unwrapped kernel elfutils luajit netperf iperf systemtap.stapBuild flex bash + libbpf ]; patches = [ @@ -38,6 +41,7 @@ python.pkgs.buildPythonApplication rec { "-DREVISION=${version}" "-DENABLE_USDT=ON" "-DENABLE_CPP_API=ON" + "-DCMAKE_USE_LIBBPF_PACKAGE=ON" ]; postPatch = '' |