java: Normalize to the default jre / jdk

2015-01-07 14:55:41 -08:00
parent bbc4262514
commit c82410eeda
20 changed files with 36 additions and 42 deletions
@@ -26,8 +26,8 @@ stdenv.mkDerivation {
    mkdir -p $out/bin
    makeWrapper $out/netbeans/bin/netbeans $out/bin/netbeans \
      --prefix PATH : ${jdk}/bin:${which}/bin \
-      --prefix JAVA_HOME : ${jdk}/lib/openjdk \
-      --add-flags "--jdkhome ${jdk}/lib/openjdk"
+      --prefix JAVA_HOME : ${jdk.home} \
+      --add-flags "--jdkhome ${jdk.home}"
      
    # Create desktop item, so we can pick it from the KDE/GNOME menu
    mkdir -p $out/share/applications