diff options
| author | Austin Seipp <aseipp@pobox.com> | 2018-02-20 09:11:12 -0600 |
|---|---|---|
| committer | Austin Seipp <aseipp@pobox.com> | 2018-02-20 14:02:04 -0600 |
| commit | 38bc86ac6c2fa8febcfa99b427e84ed92c05838f (patch) | |
| tree | fba3d971517ad8083b7c898e9c9c3ae0c1bc99a8 /pkgs/development/tools/profiling | |
| parent | d535edeb0f5e080c4f1987c2dd13e8b1d3048986 (diff) | |
| download | nixlib-38bc86ac6c2fa8febcfa99b427e84ed92c05838f.tar nixlib-38bc86ac6c2fa8febcfa99b427e84ed92c05838f.tar.gz nixlib-38bc86ac6c2fa8febcfa99b427e84ed92c05838f.tar.bz2 nixlib-38bc86ac6c2fa8febcfa99b427e84ed92c05838f.tar.lz nixlib-38bc86ac6c2fa8febcfa99b427e84ed92c05838f.tar.xz nixlib-38bc86ac6c2fa8febcfa99b427e84ed92c05838f.tar.zst nixlib-38bc86ac6c2fa8febcfa99b427e84ed92c05838f.zip | |
systemtap: add pyparsing deps for 'dtrace' script
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>
Diffstat (limited to 'pkgs/development/tools/profiling')
| -rw-r--r-- | pkgs/development/tools/profiling/systemtap/default.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix index b397f02665bc..7b313f301413 100644 --- a/pkgs/development/tools/profiling/systemtap/default.nix +++ b/pkgs/development/tools/profiling/systemtap/default.nix @@ -1,5 +1,5 @@ { fetchgit, pkgconfig, gettext, runCommand, makeWrapper -, elfutils, kernel, gnumake, python2, pythonPackages +, elfutils, kernel, gnumake, python2, python2Packages }: let @@ -17,7 +17,7 @@ let name = "systemtap-${version}"; src = fetchgit { inherit url rev sha256; }; 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 postPatch = '' substituteInPlace buildrun.cxx --replace \ @@ -39,6 +39,8 @@ let done ''; + pypkgs = with python2Packages; makePythonPath [ pyparsing ]; + in runCommand "systemtap-${kernel.version}-${version}" { inherit stapBuild kernelBuildDir; buildInputs = [ makeWrapper ]; @@ -54,8 +56,10 @@ in runCommand "systemtap-${kernel.version}-${version}" { for bin in $stapBuild/bin/*; do # hello emacs */ ln -s $bin $out/bin done - rm $out/bin/stap + rm $out/bin/stap $out/bin/dtrace makeWrapper $stapBuild/bin/stap $out/bin/stap \ --add-flags "-r $kernelBuildDir" \ --prefix PATH : ${lib.makeBinPath [ stdenv.cc.cc stdenv.cc.bintools elfutils gnumake ]} + makeWrapper $stapBuild/bin/dtrace $out/bin/dtrace \ + --prefix PYTHONPATH : ${pypkgs} '' |