Unverified Commit 859a6056 authored by Morgan Jones's avatar Morgan Jones
Browse files

android-studio-full: init 

This package provides Android Studio with a relatively complete
set of SDK and emulator packages.
parent 2ac0fcce

pkgs/applications/editors/android-studio/common.nix

+6 −2
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ 
, zlib

, makeDesktopItem

, tiling_wm # if we are using a tiling wm, need to set _JAVA_AWT_WM_NONREPARENTING in wrapper

, androidenv

}:



let
@@ -253,9 +254,12 @@ let 
    '';

    preferLocalBuild = true;

    allowSubstitutes = false;

    passthru = {

      unwrapped = androidStudio;

    passthru = let

      withSdk = androidSdk: mkAndroidStudioWrapper { inherit androidStudio androidSdk; };

    in {

      unwrapped = androidStudio;

      full = withSdk androidenv.androidPkgs.androidsdk;

      inherit withSdk;

    };

    meta = with lib; {

      description = "The Official IDE for Android (${channel} channel)";

pkgs/top-level/all-packages.nix

+3 −2
Original line number Diff line number Diff line
@@ -4069,7 +4069,7 @@ with pkgs; 
  adbfs-rootless = callPackage ../development/mobile/adbfs-rootless { };















  adb-sync = callPackage ../development/mobile/adb-sync {













    inherit (androidenv.androidPkgs_9_0) platform-tools;













    inherit (androidenv.androidPkgs) platform-tools;















  };





























  amoco = callPackage ../tools/security/amoco { };









@@ -4085,7 +4085,7 @@ with pkgs;













  androidndkPkgs_23b = (callPackage ../development/androidndk-pkgs {})."23b";















  androidndkPkgs_24 = (callPackage ../development/androidndk-pkgs {})."24";



























  androidsdk_9_0 = androidenv.androidPkgs_9_0.androidsdk;













  androidsdk = androidenv.androidPkgs.androidsdk;





























  webos = recurseIntoAttrs {















    cmake-modules = callPackage ../development/mobile/webos/cmake-modules.nix { };










@@ -29556,6 +29556,7 @@ with pkgs;













  androidStudioPackages = recurseIntoAttrs















    (callPackage ../applications/editors/android-studio { });















  android-studio = androidStudioPackages.stable;













  android-studio-full = android-studio.full;





























  antfs-cli = callPackage ../applications/misc/antfs-cli { };