diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-07-23 18:49:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-23 18:49:58 +0200 |
| commit | 3e712c9a24e7ba3e88539d530a809077741b6ead (patch) | |
| tree | 85cc938ca404fe2856a1e0bc2a7dca99190c1705 | |
| parent | 5bd0c66364512d1d8b36e49d6c8ad150f8128fc2 (diff) | |
| parent | ff3e401d1228ef096209af2d4fb42da0113c2d63 (diff) | |
| download | nixpkgs-3e712c9a24e7ba3e88539d530a809077741b6ead.tar nixpkgs-3e712c9a24e7ba3e88539d530a809077741b6ead.tar.gz nixpkgs-3e712c9a24e7ba3e88539d530a809077741b6ead.tar.bz2 nixpkgs-3e712c9a24e7ba3e88539d530a809077741b6ead.tar.lz nixpkgs-3e712c9a24e7ba3e88539d530a809077741b6ead.tar.xz nixpkgs-3e712c9a24e7ba3e88539d530a809077741b6ead.tar.zst nixpkgs-3e712c9a24e7ba3e88539d530a809077741b6ead.zip | |
Merge pull request #110567 from taku0/jdk_ln_headers
5 files changed, 16 insertions, 1 deletions
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix index bcd3309fc39..ef3e4b7219e 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix +++ b/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. diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix index f61d925036c..39685131edd 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix +++ b/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. diff --git a/pkgs/development/compilers/graalvm/community-edition.nix b/pkgs/development/compilers/graalvm/community-edition.nix index 8669b57dcca..ef35ce9d0c4 100644 --- a/pkgs/development/compilers/graalvm/community-edition.nix +++ b/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; diff --git a/pkgs/development/compilers/zulu/8.nix b/pkgs/development/compilers/zulu/8.nix index 6fcdacf535b..48573c67241 100644 --- a/pkgs/development/compilers/zulu/8.nix +++ b/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 diff --git a/pkgs/development/compilers/zulu/default.nix b/pkgs/development/compilers/zulu/default.nix index 81edb8b469a..9a5dc9f26e6 100644 --- a/pkgs/development/compilers/zulu/default.nix +++ b/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 |