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

android-studio: ANDROID_SDK_ROOT -> ANDROID_HOME

Browse Source 
Export the old one for compatibility.
This commit is contained in:
Morgan Jones
2026-04-19 17:32:10 -07:00
parent 9c2f0302bf
commit 8faa94627a
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/editors/android-studio/common.nix
+9 -8
View File
@@ -253,21 +253,22 @@ let
startScript =
let
hasAndroidSdk = androidSdk != null;
androidSdkRoot = lib.optionalString hasAndroidSdk "${androidSdk}/libexec/android-sdk";
androidHome = lib.optionalString hasAndroidSdk "${androidSdk}/libexec/android-sdk";
in
''
#!${runtimeShell}
${lib.optionalString hasAndroidSdk ''
echo "=== nixpkgs Android Studio wrapper" >&2
# Default ANDROID_SDK_ROOT to the packaged one, if not provided.
ANDROID_SDK_ROOT="''${ANDROID_SDK_ROOT-${androidSdkRoot}}"
# Default ANDROID_HOME to the packaged one, if not provided.
ANDROID_HOME="''${ANDROID_HOME-${androidHome}}"
if [ -d "$ANDROID_HOME" ]; then
export ANDROID_HOME
echo " - ANDROID_HOME=$ANDROID_HOME" >&2
if [ -d "$ANDROID_SDK_ROOT" ]; then
export ANDROID_SDK_ROOT
# Legacy compatibility.
export ANDROID_HOME="$ANDROID_SDK_ROOT"
echo " - ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT" >&2
export ANDROID_SDK_ROOT="$ANDROID_HOME"
# See if we can export ANDROID_NDK_ROOT too.
ANDROID_NDK_ROOT="$ANDROID_SDK_ROOT/ndk-bundle"
@@ -282,8 +283,8 @@ let
unset ANDROID_NDK_ROOT
fi
else
unset ANDROID_SDK_ROOT
unset ANDROID_HOME
unset ANDROID_SDK_ROOT
fi
''}
exec ${lib.getExe fhsEnv} ${lib.getExe androidStudio} "$@"