about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorTom Smeets <Tom.TSmeets@Gmail.com>2017-07-13 11:23:24 +0200
committerTom Smeets <Tom.TSmeets@Gmail.com>2017-07-13 11:38:05 +0200
commit9ab69a3416820df4b499e9a9fe0eb347985fd0c8 (patch)
treec1e6f717872e1f965d9e18de850287d6f1cc1b2c /pkgs/top-level
parent9d28cd9ca4169c5850e4b193e4a5eb9b7b451e93 (diff)
downloadnixlib-9ab69a3416820df4b499e9a9fe0eb347985fd0c8.tar
nixlib-9ab69a3416820df4b499e9a9fe0eb347985fd0c8.tar.gz
nixlib-9ab69a3416820df4b499e9a9fe0eb347985fd0c8.tar.bz2
nixlib-9ab69a3416820df4b499e9a9fe0eb347985fd0c8.tar.lz
nixlib-9ab69a3416820df4b499e9a9fe0eb347985fd0c8.tar.xz
nixlib-9ab69a3416820df4b499e9a9fe0eb347985fd0c8.tar.zst
nixlib-9ab69a3416820df4b499e9a9fe0eb347985fd0c8.zip
android-studio-preview: init at 3.0.0.5 canary 6
Added the `androidStudioPackages` attribute containing both
the `stable` and `preview` channels.
Changed the attribute `andorid-studio` to point to
  `androidStudioPackages.stable`
Added the attribute `andorid-studio-preview` pointing to
  `androidStudioPackages.preview`

I have tested this package using the new koltin support,
no issues found yet.
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix8
1 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c7533ff00e22..7c8386ffbc65 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13253,11 +13253,9 @@ with pkgs;
 
   amsn = callPackage ../applications/networking/instant-messengers/amsn { };
 
-  android-studio = callPackage ../applications/editors/android-studio {
-    fontsConf = makeFontsConf {
-      fontDirectories = [];
-    };
-  };
+  androidStudioPackages = callPackage ../applications/editors/android-studio/packages.nix {};
+  android-studio = androidStudioPackages.stable;
+  android-studio-preview = androidStudioPackages.preview;
 
   antfs-cli = callPackage ../applications/misc/antfs-cli {};