mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-24 13:53:24 +00:00
androidenv: update jdk to 17
This commit is contained in:
parent
67343f664b
commit
ded820fb03
@ -18,14 +18,14 @@ deployAndroidPackage {
|
||||
# Wrap all scripts that require JAVA_HOME
|
||||
find $ANDROID_SDK_ROOT/${package.path}/bin -maxdepth 1 -type f -executable | while read program; do
|
||||
if grep -q "JAVA_HOME" $program; then
|
||||
wrapProgram $program --prefix PATH : ${pkgs.jdk11}/bin \
|
||||
wrapProgram $program --prefix PATH : ${pkgs.jdk17}/bin \
|
||||
--prefix ANDROID_SDK_ROOT : $ANDROID_SDK_ROOT
|
||||
fi
|
||||
done
|
||||
|
||||
# Wrap sdkmanager script
|
||||
wrapProgram $ANDROID_SDK_ROOT/${package.path}/bin/sdkmanager \
|
||||
--prefix PATH : ${lib.makeBinPath [ pkgs.jdk11 ]} \
|
||||
--prefix PATH : ${lib.makeBinPath [ pkgs.jdk17 ]} \
|
||||
--add-flags "--sdk_root=$ANDROID_SDK_ROOT"
|
||||
|
||||
# Patch all script shebangs
|
||||
|
Loading…
Reference in New Issue
Block a user