pyrox.dev
linuxPackages.bpftrace: 0.9 -> 0.9.1
Signed-off-by: Austin Seipp <aseipp@pobox.com>
+3
-3
pkgs/os-specific/linux/bpftrace/default.nix
+3
-3
pkgs/os-specific/linux/bpftrace/default.nix
···
5
5
6
6
stdenv.mkDerivation rec {
7
7
name = "bpftrace-${version}";
8
-
version = "0.9";
8
+
version = "0.9.1";
9
9
10
10
src = fetchFromGitHub {
11
11
owner = "iovisor";
12
12
repo = "bpftrace";
13
13
rev = "refs/tags/v${version}";
14
-
sha256 = "1kp6as3i67dnw5v3vc1cj5hmrq6c8pjpg9g38g1qcnc9i6drl1r8";
14
+
sha256 = "17qf1c3h99iyxkc0xzix4jnxwqvxbg9ki23zm7l04qw73lj01g1m";
15
15
};
16
16
17
17
enableParallelBuilding = true;
···
30
30
# nicely without wrappers.
31
31
patchPhase = ''
32
32
patch -p1 < ${./fix-kernel-include-dir.patch}
33
-
substituteInPlace ./src/clang_parser.cpp \
33
+
substituteInPlace ./src/utils.cpp \
34
34
--subst-var-by NIX_KERNEL_SRC '${kernel.dev}/lib/modules/${kernel.modDirVersion}'
35
35
'';
36
36
+3
-3
pkgs/os-specific/linux/bpftrace/fix-kernel-include-dir.patch
+3
-3
pkgs/os-specific/linux/bpftrace/fix-kernel-include-dir.patch
···
8
8
9
9
diff --git a/src/clang_parser.cpp b/src/clang_parser.cpp
10
10
index b1db8ff..0cfb01f 100644
11
-
--- a/src/clang_parser.cpp
12
-
+++ b/src/clang_parser.cpp
11
+
--- a/src/utils.cpp
12
+
+++ b/src/utils.cpp
13
13
@@ -140,6 +140,9 @@ static bool is_dir(const std::string& path)
14
14
// Both ksrc and kobj are guaranteed to be != "", if at least some trace of kernel sources was found.
15
-
static std::tuple<std::string, std::string> get_kernel_dirs(const struct utsname& utsname)
15
+
std::tuple<std::string, std::string> get_kernel_dirs(const struct utsname& utsname)
16
16
{
17
17
+ // NB (aseipp): special case the kernel directory for nix
18
18
+ return { "@NIX_KERNEL_SRC@/source", "@NIX_KERNEL_SRC@/build" };