D4483.id14789.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D4483.id14789.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
	@@ -3,20 +3,25 @@
	, 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
	@@ -64,6 +69,10 @@
	# 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
	@@ -77,12 +86,15 @@
	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
	@@ -90,6 +102,10 @@
	export PATH=/usr/bin:$PATH
	fi

	+ # TODO: Fix aws sdk cmake installation path logic upstream
	+ export AWSSDK_ROOT_DIR=${lib.getDev aws-sdk-cpp}
	+ export AWSSDK_CORE_HEADER_FILE=${lib.getDev aws-sdk-cpp}/include/aws/core/Aws.h
	+
	echo "Welcome to Comm dev environment! :)"
	'';
	}