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

bcc: 0.3.0 -> 0.4.0

Browse Source
This commit is contained in:
Joerg Thalheim 2017-10-03 08:41:44 +01:00
parent 9e0b37944b
commit 8ee94216d3
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,39 +1,37 @@
{ stdenv, fetchFromGitHub, makeWrapper, cmake, llvmPackages_39, kernel, { stdenv, fetchFromGitHub, makeWrapper, cmake, llvmPackages_5, kernel
flex, bison, elfutils, python, pythonPackages, luajit, netperf, iperf }: , flex, bison, elfutils, python, pythonPackages, luajit, netperf, iperf }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.3.0"; version = "0.4.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 = "19lkqmilfjmj7bnhxlacd0waa5db8gf4lng12fy2zgji0d77vm1d"; sha256 = "106ri3yhjhp3dgsjb05y4j6va153d5nqln3zjdz6qfz87svak0rw";
}; };
# llvm 4.0 leads to segmentation faults, this will be fixed in llvm 5.0 buildInputs = [
# https://github.com/iovisor/bcc/issues/1276#issuecomment-319888478 llvmPackages_5.llvm llvmPackages_5.clang-unwrapped kernel
buildInputs = [ makeWrapper cmake llvmPackages_39.llvm llvmPackages_39.clang-unwrapped kernel elfutils python pythonPackages.netaddr luajit netperf iperf
flex bison elfutils python pythonPackages.netaddr luajit netperf iperf
]; ];
cmakeFlags="-DBCC_KERNEL_MODULES_DIR=${kernel.dev}/lib/modules -DBCC_KERNEL_HAS_SOURCE_DIR=1"; nativeBuildInputs = [ makeWrapper cmake flex bison ];
postInstall = '' postInstall = ''
mkdir -p $out/bin $out/share mkdir -p $out/bin $out/share
rm -r $out/share/bcc/tools/{old,doc/CMakeLists.txt} rm -r $out/share/bcc/tools/old
mv $out/share/bcc/tools/doc $out/share mv $out/share/bcc/tools/doc $out/share
mv $out/share/bcc/man $out/share/ mv $out/share/bcc/man $out/share/
for f in $out/share/bcc/tools\/*; do find $out/share/bcc/tools -type f -executable -print0 | \
if [ -x $f ]; then while IFS= read -r -d $'\0' f; do
ln -s $f $out/bin/$(basename $f) pythonLibs="$out/lib/python2.7/site-packages:${pythonPackages.netaddr}/lib/${python.libPrefix}/site-packages"
wrapProgram $f \ rm $out/bin/$(basename $f)
--prefix LD_LIBRARY_PATH : $out/lib \ makeWrapper $f $out/bin/$(basename $f) \
--prefix PYTHONPATH : $out/lib/python2.7/site-packages \ --prefix LD_LIBRARY_PATH : $out/lib \
--prefix PYTHONPATH : ${pythonPackages.netaddr}/lib/${python.libPrefix}/site-packages --prefix PYTHONPATH : "$pythonLibs"
fi
done done
''; '';