diff --git a/devenv.nix b/devenv.nix index 1e0c20ef..972e2c44 100644 --- a/devenv.nix +++ b/devenv.nix @@ -36,12 +36,6 @@ export PATH="$DEVENV_ROOT/node_modules/.bin:$PATH" ''; enterTest = '' - node --version - java -version - test -f "$ANDROID_HOME/platforms/android-35/android.jar" - test -x "$ANDROID_HOME/build-tools/35.0.0/aapt2" - test -x "$ANDROID_HOME/platform-tools/adb" - "$ANDROID_CMAKE_HOME/bin/cmake" --version - "$ANDROID_CMAKE_HOME/bin/ninja" --version + bash "$DEVENV_ROOT/scripts/check-devenv.sh" ''; } diff --git a/scripts/check-devenv.sh b/scripts/check-devenv.sh new file mode 100644 index 00000000..0cfbe539 --- /dev/null +++ b/scripts/check-devenv.sh @@ -0,0 +1,18 @@ +#!/usr/bin/env bash +set -euo pipefail + +node --version +java -version +test -f "$ANDROID_HOME/platforms/android-35/android.jar" +for version in 35.0.0 35.0.1; do + "$ANDROID_HOME/build-tools/$version/aapt2" version +done +"$ANDROID_HOME/platform-tools/adb" version +"$ANDROID_CMAKE_HOME/bin/cmake" --version +"$ANDROID_CMAKE_HOME/bin/ninja" --version +case "$(uname -s)" in + Darwin) ndk_host=darwin-x86_64 ;; + *) ndk_host=linux-x86_64 ;; +esac +test -x "$ANDROID_HOME/ndk/27.2.12479018/toolchains/llvm/prebuilt/$ndk_host/bin/clang" +echo "Faceclaw development tools verified."