summary refs log tree commit diff
path: root/pkgs/development/compilers/oraclejdk
diff options
context:
space:
mode:
authorSimon Vandel Sillesen <simon.vandel@gmail.com>2016-04-23 16:17:41 +0200
committerSimon Vandel Sillesen <simon.vandel@gmail.com>2016-04-23 16:17:41 +0200
commit0857405208623e37d20d5bc8f5ce5067dc12d7e7 (patch)
tree725868cadf306ea7a5af0d0ffa7f8eb77348c907 /pkgs/development/compilers/oraclejdk
parentdb179647d62e181a884d6d30460c9ff841808dec (diff)
downloadnixlib-0857405208623e37d20d5bc8f5ce5067dc12d7e7.tar
nixlib-0857405208623e37d20d5bc8f5ce5067dc12d7e7.tar.gz
nixlib-0857405208623e37d20d5bc8f5ce5067dc12d7e7.tar.bz2
nixlib-0857405208623e37d20d5bc8f5ce5067dc12d7e7.tar.lz
nixlib-0857405208623e37d20d5bc8f5ce5067dc12d7e7.tar.xz
nixlib-0857405208623e37d20d5bc8f5ce5067dc12d7e7.tar.zst
nixlib-0857405208623e37d20d5bc8f5ce5067dc12d7e7.zip
Oracle Java Mission Control: fix startup
The jmc binary needed some runtime dependencies. JMC can now be run.
Diffstat (limited to 'pkgs/development/compilers/oraclejdk')
-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;