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

linuxPackages.bpftrace: 0.9 -> 0.9.1

Browse Source 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
This commit is contained in:
Austin Seipp 2019-07-17 21:48:42 -05:00
parent 9aff2ef415
commit 8250dbb1a9
No known key found for this signature in database
GPG Key ID: 25D2038DEB08021D
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/os-specific/linux/bpftrace/default.nix
View File

@ -5,13 +5,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "bpftrace-${version}"; name = "bpftrace-${version}";
version = "0.9"; version = "0.9.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "iovisor"; owner = "iovisor";
repo = "bpftrace"; repo = "bpftrace";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
sha256 = "1kp6as3i67dnw5v3vc1cj5hmrq6c8pjpg9g38g1qcnc9i6drl1r8"; sha256 = "17qf1c3h99iyxkc0xzix4jnxwqvxbg9ki23zm7l04qw73lj01g1m";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
# nicely without wrappers. # nicely without wrappers.
patchPhase = '' patchPhase = ''
patch -p1 < ${./fix-kernel-include-dir.patch} patch -p1 < ${./fix-kernel-include-dir.patch}
substituteInPlace ./src/clang_parser.cpp \ substituteInPlace ./src/utils.cpp \
--subst-var-by NIX_KERNEL_SRC '${kernel.dev}/lib/modules/${kernel.modDirVersion}' --subst-var-by NIX_KERNEL_SRC '${kernel.dev}/lib/modules/${kernel.modDirVersion}'
''; '';

6
pkgs/os-specific/linux/bpftrace/fix-kernel-include-dir.patch
View File

@ -8,11 +8,11 @@ Date: Fri May 3 00:47:12 2019 -0500
diff --git a/src/clang_parser.cpp b/src/clang_parser.cpp diff --git a/src/clang_parser.cpp b/src/clang_parser.cpp
index b1db8ff..0cfb01f 100644 index b1db8ff..0cfb01f 100644
--- a/src/clang_parser.cpp --- a/src/utils.cpp
+++ b/src/clang_parser.cpp +++ b/src/utils.cpp
@@ -140,6 +140,9 @@ static bool is_dir(const std::string& path) @@ -140,6 +140,9 @@ static bool is_dir(const std::string& path)
// Both ksrc and kobj are guaranteed to be != "", if at least some trace of kernel sources was found. // Both ksrc and kobj are guaranteed to be != "", if at least some trace of kernel sources was found.
static std::tuple<std::string, std::string> get_kernel_dirs(const struct utsname& utsname) std::tuple<std::string, std::string> get_kernel_dirs(const struct utsname& utsname)
{ {
+ // NB (aseipp): special case the kernel directory for nix + // NB (aseipp): special case the kernel directory for nix
+ return { "@NIX_KERNEL_SRC@/source", "@NIX_KERNEL_SRC@/build" }; + return { "@NIX_KERNEL_SRC@/source", "@NIX_KERNEL_SRC@/build" };