summary refs log tree commit diff
path: root/nixos/modules/programs
diff options
context:
space:
mode:
authorMichael Weiss <dev.primeos@gmail.com>2022-04-03 18:56:49 +0200
committerGitHub <noreply@github.com>2022-04-03 18:56:49 +0200
commita378300562570186c853fa2cdf8f0a0ac556c38c (patch)
treef97c5c2fffa4c1d6b7c49c2d07290507793b2411 /nixos/modules/programs
parenteb40e8633a9b00b5492a7255287b7ed78b0b492a (diff)
parent146961e814c22e9cbfaaa6a75c278efb90e664f0 (diff)
downloadnixpkgs-a378300562570186c853fa2cdf8f0a0ac556c38c.tar
nixpkgs-a378300562570186c853fa2cdf8f0a0ac556c38c.tar.gz
nixpkgs-a378300562570186c853fa2cdf8f0a0ac556c38c.tar.bz2
nixpkgs-a378300562570186c853fa2cdf8f0a0ac556c38c.tar.lz
nixpkgs-a378300562570186c853fa2cdf8f0a0ac556c38c.tar.xz
nixpkgs-a378300562570186c853fa2cdf8f0a0ac556c38c.tar.zst
nixpkgs-a378300562570186c853fa2cdf8f0a0ac556c38c.zip
Merge pull request #136040 from xaverdh/adb-open
nixos/adb: switch to android-tools built from source
Diffstat (limited to 'nixos/modules/programs')
-rw-r--r--nixos/modules/programs/adb.nix3
1 files changed, 1 insertions, 2 deletions
diff --git a/nixos/modules/programs/adb.nix b/nixos/modules/programs/adb.nix
index 83bcfe886aa..9e9e37f92a8 100644
--- a/nixos/modules/programs/adb.nix
+++ b/nixos/modules/programs/adb.nix
@@ -23,8 +23,7 @@ with lib;
   ###### implementation
   config = mkIf config.programs.adb.enable {
     services.udev.packages = [ pkgs.android-udev-rules ];
-    # Give platform-tools lower priority so mke2fs+friends are taken from other packages first
-    environment.systemPackages = [ (lowPrio pkgs.androidenv.androidPkgs_9_0.platform-tools) ];
+    environment.systemPackages = [ pkgs.android-tools ];
     users.groups.adbusers = {};
   };
 }