summary refs log tree commit diff
path: root/pkgs/development/tools/java
diff options
context:
space:
mode:
authorJohn Mercier <moaxcp@gmail.com>2017-08-21 06:25:21 -0400
committerJohn Mercier <moaxcp@gmail.com>2017-08-23 21:14:57 -0400
commitd4ccf3f1b2af6c7666de2f313588652ac171e942 (patch)
tree63a1899660865bbe321a96e0f3c5b9bbfa295c0a /pkgs/development/tools/java
parentcb2f2aa563a5be0eca70d3a16a9351a7d419438f (diff)
downloadnixlib-d4ccf3f1b2af6c7666de2f313588652ac171e942.tar
nixlib-d4ccf3f1b2af6c7666de2f313588652ac171e942.tar.gz
nixlib-d4ccf3f1b2af6c7666de2f313588652ac171e942.tar.bz2
nixlib-d4ccf3f1b2af6c7666de2f313588652ac171e942.tar.lz
nixlib-d4ccf3f1b2af6c7666de2f313588652ac171e942.tar.xz
nixlib-d4ccf3f1b2af6c7666de2f313588652ac171e942.tar.zst
nixlib-d4ccf3f1b2af6c7666de2f313588652ac171e942.zip
visualvm: 1.3.8 -> 1.3.9
Diffstat (limited to 'pkgs/development/tools/java')
-rw-r--r--pkgs/development/tools/java/visualvm/default.nix21
1 files changed, 17 insertions, 4 deletions
diff --git a/pkgs/development/tools/java/visualvm/default.nix b/pkgs/development/tools/java/visualvm/default.nix
index 29d2f13ca9a8..a71ee53dced9 100644
--- a/pkgs/development/tools/java/visualvm/default.nix
+++ b/pkgs/development/tools/java/visualvm/default.nix
@@ -1,23 +1,36 @@
-{ stdenv, fetchzip, lib, makeWrapper, jdk, gtk2 }:
+{ stdenv, fetchzip, lib, makeWrapper, jdk, gtk2, gawk }:
 
 stdenv.mkDerivation rec {
-  name = "visualvm-1.3.8";
+  name = "visualvm-1.3.9";
 
   src = fetchzip {
-    url = "https://java.net/projects/visualvm/downloads/download/release138/visualvm_138.zip";
-    sha256 = "09wsi85z1g7bwyfhb37vw0gy3wl0j1cy35aj59rg7067q262gy1y";
+    url = "https://github.com/visualvm/visualvm.src/releases/download/1.3.9/visualvm_139.zip";
+    sha256 = "1gkdkxssh51jczhgv680i42jjrlia1vbpcqhxvf45xcq9xj95bm5";
   };
 
   nativeBuildInputs = [ makeWrapper ];
 
   installPhase = ''
     rm bin/visualvm.exe
+    rm platform/lib/nbexec64.exe
+    rm platform/lib/nbexec.exe
+    rm profiler/lib/deployed/jdk15/windows-amd64/profilerinterface.dll
+    rm profiler/lib/deployed/jdk15/windows/profilerinterface.dll
+    rm profiler/lib/deployed/jdk16/windows-amd64/profilerinterface.dll
+    rm profiler/lib/deployed/jdk16/windows/profilerinterface.dll
+    rm platform/modules/lib/amd64/jnidispatch-410.dll
+    rm platform/modules/lib/x86/jnidispatch-410.dll
+    rm platform/lib/nbexec.dll
+    rm platform/lib/nbexec64.dll
 
     substituteInPlace etc/visualvm.conf \
       --replace "#visualvm_jdkhome=" "visualvm_jdkhome=" \
       --replace "/path/to/jdk" "${jdk.home}" \
       --replace 'visualvm_default_options="' 'visualvm_default_options="--laf com.sun.java.swing.plaf.gtk.GTKLookAndFeel -J-Dawt.useSystemAAFontSettings=lcd -J-Dswing.aatext=true '
 
+    substituteInPlace platform/lib/nbexec \
+      --replace /usr/bin/\''${awk} ${gawk}/bin/awk
+
     cp -r . $out
 
     # To get the native LAF, JVM needs to see GTK’s .so-s.