From 3b2eb38d9abad36bad79df42d966ff80bb230029 Mon Sep 17 00:00:00 2001
From: Oleks <oleks.kuksenko@gmail.com>
Date: Fri, 29 May 2026 19:37:08 +0300
Subject: [PATCH] flake: add android-tools (adb) to devShell; justfile adb uses
 the devShell

adb is now provided by the flake's devShell (pinned to the flake's nixpkgs)
instead of an ad-hoc 'nix shell nixpkgs#android-tools' registry reference, so
the install/tv-* recipes use the same pinned adb as 'nix develop'.
---
 flake.nix | 3 +++
 justfile  | 7 ++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/flake.nix b/flake.nix
index 0dcaa69f..b9f4319d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -58,6 +58,9 @@
               pkgs.jdk17
               pkgs.gradle
               androidSdk
+              # adb/fastboot — for sideloading the built APK to a device or an
+              # Android TV (Chromecast with Google TV) over the network.
+              pkgs.android-tools
             ];
 
             ANDROID_HOME = sdkRoot;
diff --git a/justfile b/justfile
index 073de8fe..7d15b249 100644
--- a/justfile
+++ b/justfile
@@ -11,9 +11,10 @@
 pkg := ".?submodules=1#moonlight-android"
 build_flags := "--builders '' --print-build-logs"
 
-# adb from nixpkgs (no system install needed). The adb server daemon persists
-# between invocations, so `connect`/`pair` in one recipe line carries to the next.
-adb := "nix shell nixpkgs#android-tools --command adb"
+# adb from the flake devShell (android-tools, pinned to the flake's nixpkgs).
+# The adb server daemon persists between invocations, so `connect`/`pair` in
+# one recipe line carries to the next.
+adb := "nix develop '.?submodules=1' --command adb"
 
 # list available recipes
 default: