pyrox.dev
systemtap: remove hack, fix build
+2
-14
pkgs/development/tools/profiling/systemtap/default.nix
+2
-14
pkgs/development/tools/profiling/systemtap/default.nix
···
22
22
env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=deprecated-declarations" ]; # Needed with GCC 12
23
23
};
24
24
25
-
## a kernel build dir as expected by systemtap
26
-
kernelBuildDir = runCommand "kbuild-${kernel.version}-merged" { } ''
27
-
mkdir -p $out
28
-
for f in \
29
-
${kernel}/System.map \
30
-
${kernel.dev}/vmlinux \
31
-
${kernel.dev}/lib/modules/${kernel.modDirVersion}/build/{*,.*}
32
-
do
33
-
ln -s $(readlink -f $f) $out
34
-
done
35
-
'';
36
-
37
25
pypkgs = with python3.pkgs; makePythonPath [ pyparsing ];
38
26
39
27
in runCommand "systemtap-${kernel.version}-${version}" {
40
-
inherit stapBuild kernelBuildDir;
28
+
inherit stapBuild;
41
29
nativeBuildInputs = [ makeWrapper ];
42
30
meta = {
43
31
homepage = "https://sourceware.org/systemtap/";
···
52
40
done
53
41
rm $out/bin/stap $out/bin/dtrace
54
42
makeWrapper $stapBuild/bin/stap $out/bin/stap \
55
-
--add-flags "-r $kernelBuildDir" \
43
+
--add-flags "-r ${kernel.dev}" \
56
44
--prefix PATH : ${lib.makeBinPath [ stdenv.cc.cc stdenv.cc.bintools elfutils gnumake ]}
57
45
makeWrapper $stapBuild/bin/dtrace $out/bin/dtrace \
58
46
--prefix PYTHONPATH : ${pypkgs}