Page MenuHomePhabricator
Files F3342100

D4483.id14726.diff
No OneTemporary
Actions

D4483.id14726.diff
View Options

diff --git a/nix/dev-shell.nix b/nix/dev-shell.nix
--- a/nix/dev-shell.nix
+++ b/nix/dev-shell.nix
@@ -17,6 +17,7 @@
, libuv
, nodejs-16_x
, olm
+, openjdk8
, openssl
, pkg-config
, protobuf_3_15_cmake
@@ -25,6 +26,7 @@
, watchman
, rustfmt
, yarn
+, zlib
}:
mkShell {
@@ -77,12 +79,20 @@
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 [ -f /etc/NIXOS ]; then
+ # allow for impurely downloaded Android NDK tools to be used on NixOS
+ export LD_LIBRARY_PATH=${lib.makeLibraryPath [ stdenv.cc.cc.lib zlib ]}
fi
if [[ "$OSTYPE" == 'darwin'* ]]; then

File Metadata

Mime Type
text/plain
Expires
Sat, Nov 23, 12:32 AM (11 h, 47 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2566849
Default Alt Text
D4483.id14726.diff (948 B)

Event Timeline