async-profiler: 2.0 -> 2.8.1

pkgs/development/tools/async-profiler/0001-Fix-darwin-build.patch

@@ -1,27 +0,0 @@
-From e54c17899118ea940c36bc17a48d8ff759243f16 Mon Sep 17 00:00:00 2001
-From: Uri Baghin <uri@canva.com>
-Date: Sat, 8 May 2021 09:49:18 +1000
-Subject: [PATCH] Fix darwin build.
-
----
- src/itimer.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/itimer.cpp b/src/itimer.cpp
-index 08c46d1..52628ef 100644
---- a/src/itimer.cpp
-+++ b/src/itimer.cpp
-@@ -52,8 +52,8 @@ Error ITimer::start(Arguments& args) {
- 
-     OS::installSignalHandler(SIGPROF, signalHandler);
- 
--    long sec = _interval / 1000000000;
--    long usec = (_interval % 1000000000) / 1000;
-+    time_t sec = _interval / 1000000000;
-+    suseconds_t usec = (_interval % 1000000000) / 1000;
-     struct itimerval tv = {{sec, usec}, {sec, usec}};
-     
-     if (setitimer(ITIMER_PROF, &tv, NULL) != 0) {
--- 
-2.31.1
-

pkgs/development/tools/async-profiler/default.nix

@@ -1,17 +1,19 @@
-{ lib, stdenv, fetchFromGitHub, jdk8 }:
+{ lib, stdenv, fetchFromGitHub, jdk, makeWrapper }:
 
 stdenv.mkDerivation rec {
   pname = "async-profiler";
-  version = "2.0";
+  version = "2.8.1";
 
   src = fetchFromGitHub {
     owner = "jvm-profiling-tools";
     repo = "async-profiler";
     rev = "v${version}";
-    sha256 = "sha256-vSBueRNraMgLcaprPsBUriX3WZ7N0UrllnSVLL2F738=";
+    sha256 = "sha256-TbsLYPAaL2nzzRxvCD+7oaIf0s9X2s6BHIT/KD6CN74=";
   };
 
-  buildInputs = [ jdk8 ];
+  nativeBuildInputs = [ makeWrapper ];
+
+  buildInputs = [ jdk ];
 
   installPhase = ''
     runHook preInstall
@@ -22,17 +24,14 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  patches = [
-    # https://github.com/jvm-profiling-tools/async-profiler/pull/428
-    ./0001-Fix-darwin-build.patch
-  ];
-
   fixupPhase = ''
     substituteInPlace $out/bin/async-profiler \
       --replace 'JATTACH=$SCRIPT_DIR/build/jattach' \
                 'JATTACH=${placeholder "out"}/bin/jattach' \
       --replace 'PROFILER=$SCRIPT_DIR/build/libasyncProfiler.so' \
                 'PROFILER=${placeholder "out"}/lib/libasyncProfiler.so'
+
+    wrapProgram $out/bin/async-profiler --prefix PATH : ${lib.makeBinPath [ jdk ]}
   '';
 
   meta = with lib; {