diff --git a/nix/dev-shell.nix b/nix/dev-shell.nix
index cf84ab8c6..9587e01a4 100644
--- a/nix/dev-shell.nix
+++ b/nix/dev-shell.nix
@@ -1,103 +1,107 @@
 { mkShell
 , stdenv
 , lib
 , amqp-cpp
 , arcanist
 , aws-sdk-cpp
 , boost
 , cargo
 , cmake
 , cmake-format
 , cocoapods
 , corrosion
 , cryptopp
 , darwin
 , double-conversion
 , folly
 , fmt
 , glog
 , grpc
 , libiconv
 , libuv
 , nodejs-16_x
 , olm
+, openjdk8
 , openssl
 , pkg-config
 , protobuf_3_15_cmake
 , python3
 , sqlite
 , watchman
 , rustfmt
 , yarn
 }:
 
 mkShell {
 
   # programs which are meant to be executed should go here
   nativeBuildInputs = [
     # generic development
     arcanist
 
     # node development
     nodejs-16_x
     yarn
     watchman # react native
     python3
 
     # native dependencies
     # C/CXX toolchains are already brought in with mkShell
     # Identity Service
     cargo # includes rustc
     rustfmt
 
     # Tunnelbroker + CMake
     amqp-cpp
     cryptopp
     cmake
     cmake-format # linting
     libuv
     pkg-config
     protobuf_3_15_cmake
     grpc
   ] ++ lib.optionals stdenv.isDarwin [
     cocoapods # needed for ios
   ];
 
   # include any libraries buildInputs
   buildInputs = [
     # protobuf exposes both a library and a command
     # thus should appear in both inputs
     protobuf_3_15_cmake
     aws-sdk-cpp # tunnelbroker
     corrosion # tunnelbroker
     double-conversion # tunnelbroker
     glog # tunnelbroker
     folly # cpp tools
     fmt # needed for folly
     boost # needed for folly
     olm # needed for CryptoTools
     sqlite # needed for sqlite_orm
     openssl # needed for grpc
   ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
     CoreFoundation
     CoreServices
     Security
     libiconv  # identity service
   ]);
 
+  JAVA_HOME = openjdk8.passthru.home;
+
   # shell commands to be ran upon entering shell
   shellHook = let
     socket = "mysql-socket/mysql.sock";
   in ''
     if [[ "$OSTYPE" == 'linux'* ]]; then
       export MYSQL_UNIX_PORT=''${XDG_RUNTIME_DIR:-/run/user/$UID}/${socket}
+      export ANDROID_SDK_ROOT=''${ANDROID_SDK_ROOT:-$HOME/Android/Sdk}
     fi
 
     if [[ "$OSTYPE" == 'darwin'* ]]; then
       # Many commands for cocoapods expect the native BSD versions of commands
       export PATH=/usr/bin:$PATH
     fi
 
     echo "Welcome to Comm dev environment! :)"
   '';
 }