summaryrefslogtreecommitdiffhomepage
path: root/android
diff options
context:
space:
mode:
Diffstat (limited to 'android')
-rw-r--r--android/BuildInstructions.md2
-rw-r--r--android/docs/BuildInstructions.macos.md2
2 files changed, 4 insertions, 0 deletions
diff --git a/android/BuildInstructions.md b/android/BuildInstructions.md
index a58a993b49..c1051c8521 100644
--- a/android/BuildInstructions.md
+++ b/android/BuildInstructions.md
@@ -178,6 +178,8 @@ Run the following command to build a debug build:
```
## Build using nix devshell
+This is supported on Linux (x86_64) as well as macOS (x86_64 and aarch64).
+
1. Install the nix package manager by following the [official instructions](https://nixos.org/download/).
2. Enable the experimental `nix-command` and `flake` features by following [these instructions](https://nixos.wiki/wiki/flakes).
3. Launch a devshell (in `<repository>/android`) by running:
diff --git a/android/docs/BuildInstructions.macos.md b/android/docs/BuildInstructions.macos.md
index 4ef004d595..0538a2daaf 100644
--- a/android/docs/BuildInstructions.macos.md
+++ b/android/docs/BuildInstructions.macos.md
@@ -3,6 +3,8 @@
This document will guide you to setup your development environment on macOS. It has been
tested on a clean install of macOS Ventura 13.5.1 on a M2 MacBook.
+As an alternative to this guide you can also follow [these nix devshell instructions](../BuildInstructions.md#build-using-nix-devshell).
+
> __*WARNING:*__ This guide will not apply the [wireguard-go patch](https://git.zx2c4.com/wireguard-android/tree/tunnel/tools/libwg-go/goruntime-boottime-over-monotonic.diff)
> as done in Linux build instructions which may affect app performance.