diff options
| author | Albin <albin@mullvad.net> | 2025-07-16 22:00:35 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2025-07-16 22:19:35 +0200 |
| commit | 4558fafa22a0d9705dcb981bdebb789d543d045a (patch) | |
| tree | 33851b7a35080749c16e773190137c19920370a7 /android | |
| parent | 184619196eba1d5f5f45d7a72090c2fffc513c17 (diff) | |
| download | mullvadvpn-4558fafa22a0d9705dcb981bdebb789d543d045a.tar.xz mullvadvpn-4558fafa22a0d9705dcb981bdebb789d543d045a.zip | |
Add libiconv for macOS devshell
Diffstat (limited to 'android')
| -rw-r--r-- | android/flake.nix | 25 |
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; }; |