diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-12-25 17:03:57 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2018-12-25 17:03:57 +0100 |
| commit | c45e9d0fac5158d90f8c951a2899755181e97dc7 (patch) | |
| tree | 87cdea30c650739a0ef20c6342deb39e77f1e07b /nixos | |
| parent | 4c5a5dc6270d0552f71937d5d73cc36a7f3a2326 (diff) | |
| parent | 996d14a00489c5a20258229d7837649e91e9b2fc (diff) | |
| download | nixpkgs-c45e9d0fac5158d90f8c951a2899755181e97dc7.tar nixpkgs-c45e9d0fac5158d90f8c951a2899755181e97dc7.tar.gz nixpkgs-c45e9d0fac5158d90f8c951a2899755181e97dc7.tar.bz2 nixpkgs-c45e9d0fac5158d90f8c951a2899755181e97dc7.tar.lz nixpkgs-c45e9d0fac5158d90f8c951a2899755181e97dc7.tar.xz nixpkgs-c45e9d0fac5158d90f8c951a2899755181e97dc7.tar.zst nixpkgs-c45e9d0fac5158d90f8c951a2899755181e97dc7.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/programs/adb.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/nixos/modules/programs/adb.nix b/nixos/modules/programs/adb.nix index 942572cef9d..250d8c252a3 100644 --- a/nixos/modules/programs/adb.nix +++ b/nixos/modules/programs/adb.nix @@ -16,7 +16,6 @@ with lib; To grant access to a user, it must be part of adbusers group: <code>users.users.alice.extraGroups = ["adbusers"];</code> ''; - relatedPackages = [ ["androidenv" "platformTools"] ]; }; }; }; @@ -24,7 +23,7 @@ with lib; ###### implementation config = mkIf config.programs.adb.enable { services.udev.packages = [ pkgs.android-udev-rules ]; - environment.systemPackages = [ pkgs.androidenv.platformTools ]; + environment.systemPackages = [ pkgs.androidenv.androidPkgs_9_0.platform-tools ]; users.groups.adbusers = {}; }; } |