Merge pull request #14924 from simonvandel/fix-jmc

Oracle Java Mission Control: fix startup
This commit is contained in:
Joachim Fasting 2016-05-02 03:27:16 +02:00
commit d27848abb2

View file

@ -11,6 +11,7 @@
{ swingSupport ? true
, stdenv
, requireFile
, makeWrapper
, unzip
, file
, xorg ? null
@ -83,6 +84,8 @@ let result = stdenv.mkDerivation rec {
nativeBuildInputs = [ file ]
++ stdenv.lib.optional installjce unzip;
buildInputs = [ makeWrapper ];
# See: https://github.com/NixOS/patchelf/issues/10
dontStrip = 1;
@ -159,6 +162,10 @@ let result = stdenv.mkDerivation rec {
cat <<EOF >> $out/nix-support/setup-hook
if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi
EOF
# Oracle Java Mission Control needs to know where libgtk-x11 and related is
wrapProgram "$out/bin/jmc" \
--suffix-each LD_LIBRARY_PATH ':' "${rpath}" \
'';
inherit installjdk pluginSupport;