pyrox.dev
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>
+7
-3
pkgs/development/tools/profiling/systemtap/default.nix
+7
-3
pkgs/development/tools/profiling/systemtap/default.nix
···
1
1
{ fetchgit, pkgconfig, gettext, runCommand, makeWrapper
2
-
, elfutils, kernel, gnumake, python2, pythonPackages
2
+
, elfutils, kernel, gnumake, python2, python2Packages
3
3
}:
4
4
5
5
let
···
17
17
name = "systemtap-${version}";
18
18
src = fetchgit { inherit url rev sha256; };
19
19
nativeBuildInputs = [ pkgconfig ];
20
-
buildInputs = [ elfutils gettext python2 pythonPackages.setuptools ];
20
+
buildInputs = [ elfutils gettext python2 python2Packages.setuptools ];
21
21
# FIXME: Workaround for bug in kbuild, where quoted -I"/foo" flags would get mangled in out-of-tree kbuild dirs
22
22
postPatch = ''
23
23
substituteInPlace buildrun.cxx --replace \
···
39
39
done
40
40
'';
41
41
42
+
pypkgs = with python2Packages; makePythonPath [ pyparsing ];
43
+
42
44
in runCommand "systemtap-${kernel.version}-${version}" {
43
45
inherit stapBuild kernelBuildDir;
44
46
buildInputs = [ makeWrapper ];
···
54
56
for bin in $stapBuild/bin/*; do # hello emacs */
55
57
ln -s $bin $out/bin
56
58
done
57
-
rm $out/bin/stap
59
+
rm $out/bin/stap $out/bin/dtrace
58
60
makeWrapper $stapBuild/bin/stap $out/bin/stap \
59
61
--add-flags "-r $kernelBuildDir" \
60
62
--prefix PATH : ${lib.makeBinPath [ stdenv.cc.cc stdenv.cc.bintools elfutils gnumake ]}
63
+
makeWrapper $stapBuild/bin/dtrace $out/bin/dtrace \
64
+
--prefix PYTHONPATH : ${pypkgs}
61
65
''