diff options
| author | taku0 <mxxouy6x3m_github@tatapa.org> | 2020-12-12 16:19:55 +0900 |
|---|---|---|
| committer | taku0 <mxxouy6x3m_github@tatapa.org> | 2021-05-02 16:19:30 +0900 |
| commit | 5ec403bf3f289496bd5b3704cd5e32a32e4189f8 (patch) | |
| tree | 4058f26be991a095bb7b94e4abf0c7960ed6ccd3 | |
| parent | 89853530f794a8a0e7fd4b82626bf4d738a219e0 (diff) | |
| download | nixpkgs-5ec403bf3f289496bd5b3704cd5e32a32e4189f8.tar nixpkgs-5ec403bf3f289496bd5b3704cd5e32a32e4189f8.tar.gz nixpkgs-5ec403bf3f289496bd5b3704cd5e32a32e4189f8.tar.bz2 nixpkgs-5ec403bf3f289496bd5b3704cd5e32a32e4189f8.tar.lz nixpkgs-5ec403bf3f289496bd5b3704cd5e32a32e4189f8.tar.xz nixpkgs-5ec403bf3f289496bd5b3704cd5e32a32e4189f8.tar.zst nixpkgs-5ec403bf3f289496bd5b3704cd5e32a32e4189f8.zip | |
doptopenjdk: set CLASSPATH
See: #106716.
| -rw-r--r-- | pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix index 262e52c2521..71a55c68290 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix @@ -3,6 +3,7 @@ { swingSupport ? true # not used for now , lib, stdenv , fetchurl +, setJavaClassPath }: let cpuName = stdenv.hostPlatform.parsed.cpu.name; @@ -30,7 +31,11 @@ let cpuName = stdenv.hostPlatform.parsed.cpu.name; ln -s $out/Contents/Home/* $out/ + # Propagate the setJavaClassPath setup hook from the JDK so that + # any package that depends on the JDK has $CLASSPATH set up + # properly. mkdir -p $out/nix-support + printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs # Set JAVA_HOME automatically. cat <<EOF >> $out/nix-support/setup-hook diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix index a433a2f1321..e304f67bd75 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix @@ -5,6 +5,7 @@ , fetchurl , autoPatchelfHook , makeWrapper +, setJavaClassPath # minimum dependencies , alsaLib , fontconfig @@ -74,7 +75,11 @@ let result = stdenv.mkDerivation rec { # https://github.com/NixOS/nixpkgs/issues/57733 find "$out" -name 'libfreetype.so*' -delete + # Propagate the setJavaClassPath setup hook from the JDK so that + # any package that depends on the JDK has $CLASSPATH set up + # properly. mkdir -p $out/nix-support + printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs # Set JAVA_HOME automatically. cat <<EOF >> "$out/nix-support/setup-hook" |