Fix building on NixOS (#1219)

* shell.nix: bump platform version to match target

* shell.nix: make gradlew work on NixOS

This removes the wrapper provided by `shell.nix`. Folks expect the
`./gradlew` wrapper to work, so this approach is more straightforward.

1 files changed, 3 insertions, 13 deletions

diff --git a/shell.nix b/shell.nix
index e517d48..23a934a 100644
--- a/shell.nix
+++ b/shell.nix
@@ -9,7 +9,7 @@ let
 
   android = pkgs.androidenv.composeAndroidPackages {
     buildToolsVersions = [ build_tools_version ];
-    platformVersions = [ "35" ];
+    platformVersions = [ "36" ];
     abiVersions = [ "armeabi-v7a" ];
     includeNDK = true;
     ndkVersion = "27.0.12077973";
@@ -36,26 +36,16 @@ let
 
   ANDROID_SDK_ROOT = "${android.androidsdk}/libexec/android-sdk";
 
-  gradle = pkgs.gradle.override { java = jdk; };
-  # Without this option, aapt2 fails to run with a permissions error.
-  gradle_wrapped = pkgs.runCommandLocal "gradle-wrapped" {
-    nativeBuildInputs = with pkgs; [ makeBinaryWrapper ];
-  } ''
-    mkdir -p $out/bin
-    ln -s ${gradle}/bin/gradle $out/bin/gradle
-    wrapProgram $out/bin/gradle \
-    --add-flags "-Dorg.gradle.project.android.aapt2FromMavenOverride=${ANDROID_SDK_ROOT}/build-tools/${build_tools_version}/aapt2"
-  '';
-
 in pkgs.mkShell {
   buildInputs = [
     pkgs.findutils
     pkgs.fontforge
     jdk
     android.androidsdk
-    gradle_wrapped
+    (pkgs.gradle.override { java = jdk; })
     emulators
   ];
   JAVA_HOME = jdk.home;
   inherit ANDROID_SDK_ROOT;
+  GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${ANDROID_SDK_ROOT}/build-tools/${build_tools_version}/aapt2";
 }