treewide: produce darwin JDK bundles at a consistent path

Author: Samasaur1

pkgs/development/compilers/temurin-bin/jdk-darwin-base.nix

@@ -19,7 +19,7 @@ let
   providedCpuTypes = builtins.filter (arch: builtins.elem arch validCpuTypes) (
     builtins.attrNames sourcePerArch
   );
-  result = stdenv.mkDerivation {
+  result = stdenv.mkDerivation rec {
     pname =
       if sourcePerArch.packageType == "jdk" then
         "${name-prefix}-bin"
@@ -40,16 +40,19 @@ let
     installPhase = ''
       cd ..
 
-      mv $sourceRoot $out
+      mkdir -p $out/Library/Java/JavaVirtualMachines
+
+      bundle=$out/Library/Java/JavaVirtualMachines/${name-prefix}-${lib.versions.major version}.jdk
+      mv $sourceRoot $bundle
 
       # jni.h expects jni_md.h to be in the header search path.
-      ln -s $out/Contents/Home/include/darwin/*_md.h $out/Contents/Home/include/
+      ln -s $bundle/Contents/Home/include/darwin/*_md.h $bundle/Contents/Home/include/
 
       # Remove some broken manpages.
       # Only for 11 and earlier.
-      [ -e "$out/Contents/Home/man/ja" ] && rm -r $out/Contents/Home/man/ja
+      [ -e "$bundle/Contents/Home/man/ja" ] && rm -r $bundle/Contents/Home/man/ja
 
-      ln -s $out/Contents/Home/* $out/
+      ln -s $bundle/Contents/Home/* $out/
 
       # Propagate the setJavaClassPath setup hook from the JDK so that
       # any package that depends on the JDK has $CLASSPATH set up
@@ -67,7 +70,7 @@ let
     passthru = {
       jre = result;
       home = result;
-      bundle = result;
+      bundle = "${result}/Library/Java/JavaVirtualMachines/${name-prefix}-${lib.versions.major version}.jdk";
     };
 
     meta = with lib; {

pkgs/development/compilers/zulu/common.nix

@@ -120,6 +120,13 @@ let
       mkdir -p $out
       mv * $out
 
+      ${lib.optionalString stdenv.hostPlatform.isDarwin ''
+        mkdir -p $out/Library/Java/JavaVirtualMachines
+        bundle=$out/Library/Java/JavaVirtualMachines/zulu-${lib.versions.major version}.jdk
+        mv $out/zulu-${lib.versions.major version}.jdk $bundle
+        ln -sf $bundle/Contents/Home/* $out/
+      ''}
+
       unzip ${jce-policies}
       mv -f ZuluJCEPolicies/*.jar $out/${lib.optionalString isJdk8 "jre/"}lib/security/
 
@@ -174,8 +181,10 @@ let
       })
       // {
         home = jdk;
-        bundle = "${jdk}/zulu-${lib.versions.major version}.jdk";
-      };
+      }
+      // (lib.optionalAttrs stdenv.hostPlatform.isDarwin {
+        bundle = "${jdk}/Library/Java/JavaVirtualMachines/zulu-${lib.versions.major version}.jdk";
+      });
 
     meta = {
       description = "Certified builds of OpenJDK";