Merge pull request #28525 from moaxcp/master

visualvm: 1.3.8 -> 1.3.9
This commit is contained in:
Jörg Thalheim 2017-08-25 08:06:56 +01:00 committed by GitHub
commit f9127f8293

View file

@ -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 GTKs .so-s.