diff --git a/shell.nix b/shell.nix
index ff7d8aaa..34e19b65 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,8 +1,25 @@
 { pkgs ? import <nixpkgs> { config.android_sdk.accept_license = true; } }:
 
-(pkgs.buildFHSUserEnv {
-  name = "android-sdk-env";
-  targetPkgs = pkgs:
-    (with pkgs; [ androidenv.androidPkgs_9_0.androidsdk gradle glibc zlib ]);
-  runScript = "bash";
-}).env
+let
+  androidComposition = pkgs.androidenv.composeAndroidPackages {
+    toolsVersion = "26.1.1";
+    platformToolsVersion = "31.0.3";
+    buildToolsVersions = [ "31.0.0" ];
+    includeEmulator = false;
+    emulatorVersion = "30.9.0";
+    platformVersions = [ "31" ];
+    includeSources = false;
+    includeSystemImages = false;
+    systemImageTypes = [ ];
+    abiVersions = [ ];
+    cmakeVersions = [ ];
+    includeNDK = false;
+    ndkVersions = [ ];
+    useGoogleAPIs = false;
+    useGoogleTVAddOns = false;
+    includeExtras = [ ];
+  };
+in pkgs.mkShell rec {
+  ANDROID_SDK_ROOT = "${androidComposition.androidsdk}/libexec/android-sdk";
+  buildInputs = with pkgs; [ gradle glibc zlib ];
+}