diff options
author | Austin Seipp <aseipp@pobox.com> | 2019-07-17 21:48:42 -0500 |
---|---|---|
committer | Austin Seipp <aseipp@pobox.com> | 2019-07-17 21:48:54 -0500 |
commit | 8250dbb1a99ee96845d88d78a9f4e757302f1730 (patch) | |
tree | 57c460a6792b9a5f2d182228b32173013c84a039 /pkgs/os-specific/linux/bpftrace | |
parent | 9aff2ef415aa3f6b943df59f0d3761359d0cd2bf (diff) | |
download | nixpkgs-8250dbb1a99ee96845d88d78a9f4e757302f1730.tar nixpkgs-8250dbb1a99ee96845d88d78a9f4e757302f1730.tar.gz nixpkgs-8250dbb1a99ee96845d88d78a9f4e757302f1730.tar.bz2 nixpkgs-8250dbb1a99ee96845d88d78a9f4e757302f1730.tar.lz nixpkgs-8250dbb1a99ee96845d88d78a9f4e757302f1730.tar.xz nixpkgs-8250dbb1a99ee96845d88d78a9f4e757302f1730.tar.zst nixpkgs-8250dbb1a99ee96845d88d78a9f4e757302f1730.zip |
linuxPackages.bpftrace: 0.9 -> 0.9.1
Signed-off-by: Austin Seipp <aseipp@pobox.com>
Diffstat (limited to 'pkgs/os-specific/linux/bpftrace')
-rw-r--r-- | pkgs/os-specific/linux/bpftrace/default.nix | 6 | ||||
-rw-r--r-- | pkgs/os-specific/linux/bpftrace/fix-kernel-include-dir.patch | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/bpftrace/default.nix b/pkgs/os-specific/linux/bpftrace/default.nix index 87355fbcc2e..a2ebc0cdc53 100644 --- a/pkgs/os-specific/linux/bpftrace/default.nix +++ b/pkgs/os-specific/linux/bpftrace/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "bpftrace-${version}"; - version = "0.9"; + version = "0.9.1"; src = fetchFromGitHub { owner = "iovisor"; repo = "bpftrace"; rev = "refs/tags/v${version}"; - sha256 = "1kp6as3i67dnw5v3vc1cj5hmrq6c8pjpg9g38g1qcnc9i6drl1r8"; + sha256 = "17qf1c3h99iyxkc0xzix4jnxwqvxbg9ki23zm7l04qw73lj01g1m"; }; enableParallelBuilding = true; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { # nicely without wrappers. patchPhase = '' 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}' ''; diff --git a/pkgs/os-specific/linux/bpftrace/fix-kernel-include-dir.patch b/pkgs/os-specific/linux/bpftrace/fix-kernel-include-dir.patch index 0c6ffc471ad..bff370d51e2 100644 --- a/pkgs/os-specific/linux/bpftrace/fix-kernel-include-dir.patch +++ b/pkgs/os-specific/linux/bpftrace/fix-kernel-include-dir.patch @@ -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 index b1db8ff..0cfb01f 100644 ---- a/src/clang_parser.cpp -+++ b/src/clang_parser.cpp +--- a/src/utils.cpp ++++ b/src/utils.cpp @@ -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. - 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 + return { "@NIX_KERNEL_SRC@/source", "@NIX_KERNEL_SRC@/build" }; |