From b727b7a0fa753dadc74175a3153793eaa5261078 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 4 Nov 2023 17:46:13 +1300 Subject: [PATCH] shell: Remove android stuff It doesn't eval rn. --- shell.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/shell.nix b/shell.nix index 6ddb2b6..7c251ee 100644 --- a/shell.nix +++ b/shell.nix @@ -85,7 +85,7 @@ pkgs.mkShell { pkgs.clang-tools # clang-format pkgs.nixpkgs-fmt - androidSDK + # androidSDK pythonEnv @@ -93,9 +93,9 @@ pkgs.mkShell { embeddedproto ]; - # Android workarounds - JAVA_HOME = "${pkgs.openjdk.home}"; - GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${androidSDK}/share/android-sdk/build-tools/34.0.0/aapt2"; + # # Android workarounds + # JAVA_HOME = "${pkgs.openjdk.home}"; + # GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${androidSDK}/share/android-sdk/build-tools/34.0.0/aapt2"; shellHook = '' export PATH=${builtins.toString ./pkgs/espressos-web/node_modules/.bin}:"$PATH"