Merge branch 'add-devshell-commands'

2 files changed, 18 insertions, 0 deletions

diff --git a/android/BuildInstructions.md b/android/BuildInstructions.md
index c1051c8521..399ed41ad6 100644
--- a/android/BuildInstructions.md
+++ b/android/BuildInstructions.md
@@ -188,6 +188,10 @@ This is supported on Linux (x86_64) as well as macOS (x86_64 and aarch64).
    ```
 4. Build the app as usual by running for example:
    ```bash
+   build
+   ```
+   or
+   ```bash
    ./build.sh --dev-build
    ```
    or
diff --git a/android/flake.nix b/android/flake.nix
index 8cf0d4a26a..b48befe941 100644
--- a/android/flake.nix
+++ b/android/flake.nix
@@ -111,6 +111,20 @@
         env = import ./nix/env-vars.nix {
           inherit pkgs android-sdk buildToolsVersion ndkVersion minSdkVersion;
         };
+        # Unfortunately rich menus with package, description and category
+        # is only supported using the TOML format and not when using mkShell.
+        # The two cannot be combined and TOML format by itself doesn't support
+        # the way we dynamically configure the devshell.
+        commands = [
+          {
+            name = "tasks";
+            command = "./gradlew tasks";
+          }
+          {
+            name = "build";
+            command = "./gradlew assembleOssProdDebug";
+          }
+        ];
       };
     });
 }