diff options
| author | Sander van der Burg <svanderburg@gmail.com> | 2018-11-18 13:51:06 +0100 |
|---|---|---|
| committer | Sander van der Burg <svanderburg@gmail.com> | 2018-12-18 21:16:06 +0100 |
| commit | 53550c826df9f46397ac4f28283db32bd9285e48 (patch) | |
| tree | ac0f86b9e3746d15f27416e63f6146b17e9e3c93 /pkgs/top-level | |
| parent | 27f8b6b89e431ba7c1c98231ff297022d928e2ef (diff) | |
| download | nixlib-53550c826df9f46397ac4f28283db32bd9285e48.tar nixlib-53550c826df9f46397ac4f28283db32bd9285e48.tar.gz nixlib-53550c826df9f46397ac4f28283db32bd9285e48.tar.bz2 nixlib-53550c826df9f46397ac4f28283db32bd9285e48.tar.lz nixlib-53550c826df9f46397ac4f28283db32bd9285e48.tar.xz nixlib-53550c826df9f46397ac4f28283db32bd9285e48.tar.zst nixlib-53550c826df9f46397ac4f28283db32bd9285e48.zip | |
Port packages with Android dependencies to new androidenv
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 69446ff6ea7b..cb4ecf8a574b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -539,7 +539,7 @@ in ansifilter = callPackage ../tools/text/ansifilter {}; apktool = callPackage ../development/tools/apktool { - buildTools = androidenv.buildTools; + inherit (androidenv.androidPkgs_9_0) build-tools; }; appimage-run = callPackage ../tools/package-management/appimage-run {}; @@ -822,7 +822,7 @@ in abootimg = callPackage ../development/mobile/abootimg {}; adbfs-rootless = callPackage ../development/mobile/adbfs-rootless { - adb = androidenv.platformTools; + adb = androidenv.androidPkgs_9_0.platform-tools; }; adb-sync = callPackage ../development/mobile/adb-sync { }; @@ -832,15 +832,11 @@ in #licenseAccepted = (config.android_sdk.accept_license or false); }; - inherit (androidenv) androidndk; - androidndkPkgs = androidndkPkgs_17c; androidndkPkgs_17c = (callPackage ../development/androidndk-pkgs {})."17c"; androidndkPkgs_10e = (callPackage ../development/androidndk-pkgs {})."10e"; - androidsdk = androidenv.androidsdk_8_0; - - androidsdk_extras = res.androidenv.androidsdk_8_0_extras; + androidsdk_9_0 = androidenv.androidPkgs_9_0.androidsdk; webos = recurseIntoAttrs { cmake-modules = callPackage ../development/mobile/webos/cmake-modules.nix { }; @@ -2678,7 +2674,7 @@ in flamerobin = callPackage ../applications/misc/flamerobin { }; flashtool = pkgsi686Linux.callPackage ../development/mobile/flashtool { - platformTools = androidenv.platformTools; + inherit (androidenv.androidPkgs_9_0) platform-tools; }; flashrom = callPackage ../tools/misc/flashrom { }; @@ -5311,7 +5307,7 @@ in }; scrcpy = callPackage ../misc/scrcpy { - inherit (androidenv) platformTools; + inherit (androidenv.androidPkgs_9_0) platform-tools; }; screen-message = callPackage ../tools/X11/screen-message { }; |