summary refs log tree commit diff
diff options
context:
space:
mode:
authorJoachim Fasting <joachifm@users.noreply.github.com>2016-05-02 03:27:16 +0200
committerJoachim Fasting <joachifm@users.noreply.github.com>2016-05-02 03:27:16 +0200
commitd27848abb2315f02fd7e460ba6f6832262fc0e5f (patch)
tree54cb9911e66ba68edeff1795245d2e63fcd9ef0b
parent889f36498f074bbe3d173b3e46a4e70454805eae (diff)
parent0857405208623e37d20d5bc8f5ce5067dc12d7e7 (diff)
downloadnixlib-d27848abb2315f02fd7e460ba6f6832262fc0e5f.tar
nixlib-d27848abb2315f02fd7e460ba6f6832262fc0e5f.tar.gz
nixlib-d27848abb2315f02fd7e460ba6f6832262fc0e5f.tar.bz2
nixlib-d27848abb2315f02fd7e460ba6f6832262fc0e5f.tar.lz
nixlib-d27848abb2315f02fd7e460ba6f6832262fc0e5f.tar.xz
nixlib-d27848abb2315f02fd7e460ba6f6832262fc0e5f.tar.zst
nixlib-d27848abb2315f02fd7e460ba6f6832262fc0e5f.zip
Merge pull request #14924 from simonvandel/fix-jmc
Oracle Java Mission Control: fix startup
-rw-r--r--pkgs/development/compilers/oraclejdk/jdk-linux-base.nix7
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
index a18ffcbf3d4b..fe5b3b712588 100644
--- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
@@ -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;