diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index 7a3484140eba..32ec73d13008 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -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} "$@"