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

systemtap: add pyparsing deps for 'dtrace' script

Browse Source 
Otherwise, if it fails, it fails with a very bad error about not
being able to import ParseException.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
This commit is contained in:
Austin Seipp 2018-02-20 09:11:12 -06:00
parent d535edeb0f
commit 38bc86ac6c
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/tools/profiling/systemtap/default.nix
View File

@ -1,5 +1,5 @@
{ fetchgit, pkgconfig, gettext, runCommand, makeWrapper { fetchgit, pkgconfig, gettext, runCommand, makeWrapper
, elfutils, kernel, gnumake, python2, pythonPackages , elfutils, kernel, gnumake, python2, python2Packages
}: }:
let let
@ -17,7 +17,7 @@ let
name = "systemtap-${version}"; name = "systemtap-${version}";
src = fetchgit { inherit url rev sha256; }; src = fetchgit { inherit url rev sha256; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ elfutils gettext python2 pythonPackages.setuptools ]; buildInputs = [ elfutils gettext python2 python2Packages.setuptools ];
# FIXME: Workaround for bug in kbuild, where quoted -I"/foo" flags would get mangled in out-of-tree kbuild dirs # FIXME: Workaround for bug in kbuild, where quoted -I"/foo" flags would get mangled in out-of-tree kbuild dirs
postPatch = '' postPatch = ''
substituteInPlace buildrun.cxx --replace \ substituteInPlace buildrun.cxx --replace \
@ -39,6 +39,8 @@ let
done done
''; '';
pypkgs = with python2Packages; makePythonPath [ pyparsing ];
in runCommand "systemtap-${kernel.version}-${version}" { in runCommand "systemtap-${kernel.version}-${version}" {
inherit stapBuild kernelBuildDir; inherit stapBuild kernelBuildDir;
buildInputs = [ makeWrapper ]; buildInputs = [ makeWrapper ];
@ -54,8 +56,10 @@ in runCommand "systemtap-${kernel.version}-${version}" {
for bin in $stapBuild/bin/*; do # hello emacs */ for bin in $stapBuild/bin/*; do # hello emacs */
ln -s $bin $out/bin ln -s $bin $out/bin
done done
rm $out/bin/stap rm $out/bin/stap $out/bin/dtrace
makeWrapper $stapBuild/bin/stap $out/bin/stap \ makeWrapper $stapBuild/bin/stap $out/bin/stap \
--add-flags "-r $kernelBuildDir" \ --add-flags "-r $kernelBuildDir" \
--prefix PATH : ${lib.makeBinPath [ stdenv.cc.cc stdenv.cc.bintools elfutils gnumake ]} --prefix PATH : ${lib.makeBinPath [ stdenv.cc.cc stdenv.cc.bintools elfutils gnumake ]}
makeWrapper $stapBuild/bin/dtrace $out/bin/dtrace \
--prefix PYTHONPATH : ${pypkgs}
'' ''