Merge pull request #110567 from taku0/jdk_ln_headers

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

@@ -26,6 +26,9 @@ let cpuName = stdenv.hostPlatform.parsed.cpu.name;
 
     mv $sourceRoot $out
 
+    # 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/
+
     rm -rf $out/Home/demo
 
     # Remove some broken manpages.

pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix

@@ -66,6 +66,9 @@ let result = stdenv.mkDerivation rec {
 
     mv $sourceRoot $out
 
+    # jni.h expects jni_md.h to be in the header search path.
+    ln -s $out/include/linux/*_md.h $out/include/
+
     rm -rf $out/demo
 
     # Remove some broken manpages.

pkgs/development/compilers/graalvm/community-edition.nix

@@ -185,7 +185,10 @@ let
               --replace file:/dev/random    file:/dev/./urandom \
               --replace NativePRNGBlocking  SHA1PRNG
           '';
-        }.${javaVersionPlatform};
+        }.${javaVersionPlatform} + ''
+          # jni.h expects jni_md.h to be in the header search path.
+          ln -s $out/include/linux/*_md.h $out/include/
+        '';
 
         dontStrip = true;
 

pkgs/development/compilers/zulu/8.nix

@@ -70,6 +70,9 @@ in stdenv.mkDerivation {
     mkdir -p $out
     cp -r ./* "$out/"
 
+    # jni.h expects jni_md.h to be in the header search path.
+    ln -s $out/include/linux/*_md.h $out/include/
+
     mkdir -p $out/nix-support
     printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs
 

pkgs/development/compilers/zulu/default.nix

@@ -72,6 +72,9 @@ in stdenv.mkDerivation {
     mkdir -p $out
     cp -r ./* "$out/"
 
+    # jni.h expects jni_md.h to be in the header search path.
+    ln -s $out/include/linux/*_md.h $out/include/
+
     mkdir -p $out/nix-support
     printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs