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

linuxPackages.bcc: 0.4.0 -> 0.5.0

Browse Source
This commit is contained in:
Jörg Thalheim 2018-01-05 09:38:35 +01:00
parent 8124abd16a
commit 14f3eb2dfd
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/os-specific/linux/bcc/default.nix
View File

@ -1,15 +1,15 @@
{ stdenv, fetchFromGitHub, makeWrapper, cmake, llvmPackages_5, kernel { stdenv, fetchFromGitHub, fetchpatch, makeWrapper, cmake, llvmPackages_5, kernel
, flex, bison, elfutils, python, pythonPackages, luajit, netperf, iperf }: , flex, bison, elfutils, python, pythonPackages, luajit, netperf, iperf, libelf }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.4.0"; version = "0.5.0";
name = "bcc-${version}"; name = "bcc-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "iovisor"; owner = "iovisor";
repo = "bcc"; repo = "bcc";
rev = "v${version}"; rev = "v${version}";
sha256 = "106ri3yhjhp3dgsjb05y4j6va153d5nqln3zjdz6qfz87svak0rw"; sha256 = "0bb3244xll5sqx0lvrchg71qy2zg0yj6r5h4v5fvrg1fjhaldys9";
}; };
buildInputs = [ buildInputs = [
@ -17,7 +17,17 @@ stdenv.mkDerivation rec {
elfutils python pythonPackages.netaddr luajit netperf iperf elfutils python pythonPackages.netaddr luajit netperf iperf
]; ];
nativeBuildInputs = [ makeWrapper cmake flex bison ]; patches = [
# fix build with llvm > 5.0.0 && < 6.0.0
(fetchpatch {
url = "https://github.com/iovisor/bcc/commit/bd7fa55bb39b8978dafd0b299e35616061e0a368.patch";
sha256 = "1sgxhsq174iihyk1x08py73q8fh78d7y3c90k5nh8vcw2pf1xbnf";
})
];
nativeBuildInputs = [ makeWrapper cmake flex bison ]
# libelf is incompatible with elfutils-libelf
++ stdenv.lib.filter (x: x != libelf) kernel.moduleBuildDependencies;
cmakeFlags="-DBCC_KERNEL_MODULES_DIR=${kernel.dev}/lib/modules"; cmakeFlags="-DBCC_KERNEL_MODULES_DIR=${kernel.dev}/lib/modules";