Merge pull request #139997 from emptyflask/google-java-format-fix

google-java-format: fix for jdk 16
This commit is contained in:
Sandro 2021-10-01 00:01:21 +02:00 committed by GitHub
commit f78a19a86b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -17,11 +17,17 @@ stdenv.mkDerivation rec {
installPhase = ''
runHook preInstall
mkdir -p $out/{bin,share/google-java-format}
install -D ${src} $out/share/google-java-format/google-java-format.jar
mkdir -p $out/{bin,share/${pname}}
install -D ${src} $out/share/${pname}/google-java-format-${version}-all-deps.jar
makeWrapper ${jre}/bin/java $out/bin/google-java-format \
--add-flags "-jar $out/share/google-java-format/google-java-format.jar"
makeWrapper ${jre}/bin/java $out/bin/${pname} \
--argv0 ${pname} \
--add-flags "--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" \
--add-flags "--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED" \
--add-flags "--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED" \
--add-flags "--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED" \
--add-flags "--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED" \
--add-flags "-jar $out/share/${pname}/google-java-format-${version}-all-deps.jar"
runHook postInstall
'';