public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #14924 from simonvandel/fix-jmc

Browse Source 
Oracle Java Mission Control: fix startup
This commit is contained in:
Joachim Fasting 2016-05-02 03:27:16 +02:00
commit d27848abb2
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
View File

@ -11,6 +11,7 @@
{ swingSupport ? true { swingSupport ? true
, stdenv , stdenv
, requireFile , requireFile
, makeWrapper
, unzip , unzip
, file , file
, xorg ? null , xorg ? null
@ -83,6 +84,8 @@ let result = stdenv.mkDerivation rec {
nativeBuildInputs = [ file ] nativeBuildInputs = [ file ]
++ stdenv.lib.optional installjce unzip; ++ stdenv.lib.optional installjce unzip;
buildInputs = [ makeWrapper ];
# See: https://github.com/NixOS/patchelf/issues/10 # See: https://github.com/NixOS/patchelf/issues/10
dontStrip = 1; dontStrip = 1;
@ -159,6 +162,10 @@ let result = stdenv.mkDerivation rec {
cat <<EOF >> $out/nix-support/setup-hook cat <<EOF >> $out/nix-support/setup-hook
if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi
EOF 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; inherit installjdk pluginSupport;