public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #106737 from taku0/set_classpath

Browse Source 
adoptopenjdk: set CLASSPATH
This commit is contained in:
Arnout Engelen 2021-05-03 08:51:13 +02:00 committed by GitHub
commit afdee7e058
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,6 +3,7 @@
{ swingSupport ? true # not used for now { swingSupport ? true # not used for now
, lib, stdenv , lib, stdenv
, fetchurl , fetchurl
, setJavaClassPath
}: }:
let cpuName = stdenv.hostPlatform.parsed.cpu.name; let cpuName = stdenv.hostPlatform.parsed.cpu.name;
@ -30,7 +31,11 @@ let cpuName = stdenv.hostPlatform.parsed.cpu.name;
ln -s $out/Contents/Home/* $out/ 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 mkdir -p $out/nix-support
printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs
# Set JAVA_HOME automatically. # Set JAVA_HOME automatically.
cat <<EOF >> $out/nix-support/setup-hook cat <<EOF >> $out/nix-support/setup-hook

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

@ -5,6 +5,7 @@
, fetchurl , fetchurl
, autoPatchelfHook , autoPatchelfHook
, makeWrapper , makeWrapper
, setJavaClassPath
# minimum dependencies # minimum dependencies
, alsaLib , alsaLib
, fontconfig , fontconfig
@ -74,7 +75,11 @@ let result = stdenv.mkDerivation rec {
# https://github.com/NixOS/nixpkgs/issues/57733 # https://github.com/NixOS/nixpkgs/issues/57733
find "$out" -name 'libfreetype.so*' -delete 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 mkdir -p $out/nix-support
printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs
# Set JAVA_HOME automatically. # Set JAVA_HOME automatically.
cat <<EOF >> "$out/nix-support/setup-hook" cat <<EOF >> "$out/nix-support/setup-hook"