summaryrefslogtreecommitdiffhomepage
path: root/android
diff options
context:
space:
mode:
Diffstat (limited to 'android')
-rw-r--r--android/flake.nix25
1 files changed, 14 insertions, 11 deletions
diff --git a/android/flake.nix b/android/flake.nix
index 4717083f56..8cf0d4a26a 100644
--- a/android/flake.nix
+++ b/android/flake.nix
@@ -94,17 +94,20 @@
devShells.default = pkgs.devshell.mkShell {
name = "mullvad-android-devshell";
- packages = [
- android-sdk
- rust-toolchain
- patchedGo_1_21_3
- pkgs.protoc-gen-grpc-java
- pkgs.gcc
- pkgs.gnumake
- pkgs.protobuf
- pkgs.jdk17
- pkgs.python3Full
- ];
+ packages =
+ [
+ android-sdk
+ rust-toolchain
+ patchedGo_1_21_3
+ pkgs.protoc-gen-grpc-java
+ pkgs.gcc
+ pkgs.gnumake
+ pkgs.protobuf
+ pkgs.jdk17
+ pkgs.python3Full
+ ]
+ ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [pkgs.libiconv];
+
env = import ./nix/env-vars.nix {
inherit pkgs android-sdk buildToolsVersion ndkVersion minSdkVersion;
};