summary refs log tree commit diff
path: root/nixos/modules/programs/adb.nix
diff options
context:
space:
mode:
authorWill Dietz <w@wdtz.org>2019-11-16 14:33:37 -0600
committerLassulus <github@lassul.us>2019-11-20 22:57:00 +0100
commit6ee7b4ddd8bcff4f241872835c1a205e91e49841 (patch)
tree79151f6a71c6e794b3c5ad20f872f15eb45f8402 /nixos/modules/programs/adb.nix
parent86a760948b9066535265cfb1724fcbb87534259f (diff)
downloadnixpkgs-6ee7b4ddd8bcff4f241872835c1a205e91e49841.tar
nixpkgs-6ee7b4ddd8bcff4f241872835c1a205e91e49841.tar.gz
nixpkgs-6ee7b4ddd8bcff4f241872835c1a205e91e49841.tar.bz2
nixpkgs-6ee7b4ddd8bcff4f241872835c1a205e91e49841.tar.lz
nixpkgs-6ee7b4ddd8bcff4f241872835c1a205e91e49841.tar.xz
nixpkgs-6ee7b4ddd8bcff4f241872835c1a205e91e49841.tar.zst
nixpkgs-6ee7b4ddd8bcff4f241872835c1a205e91e49841.zip
nixos/adb: don't make android tools the system-wide mke2fs, lowPrio
Diffstat (limited to 'nixos/modules/programs/adb.nix')
-rw-r--r--nixos/modules/programs/adb.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/nixos/modules/programs/adb.nix b/nixos/modules/programs/adb.nix
index 250d8c252a3..83bcfe886aa 100644
--- a/nixos/modules/programs/adb.nix
+++ b/nixos/modules/programs/adb.nix
@@ -23,7 +23,8 @@ with lib;
   ###### implementation
   config = mkIf config.programs.adb.enable {
     services.udev.packages = [ pkgs.android-udev-rules ];
-    environment.systemPackages = [ pkgs.androidenv.androidPkgs_9_0.platform-tools ];
+    # Give platform-tools lower priority so mke2fs+friends are taken from other packages first
+    environment.systemPackages = [ (lowPrio pkgs.androidenv.androidPkgs_9_0.platform-tools) ];
     users.groups.adbusers = {};
   };
 }