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'.
This commit is contained in:
Oleks
2026-05-29 19:37:08 +03:00
parent cfa28298bc
commit 3b2eb38d9a
2 changed files with 7 additions and 3 deletions
+3
View File
@@ -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;
+4 -3
View File
@@ -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: