diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-07-19 00:39:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-19 00:39:10 +0100 |
| commit | b2caceced316877aff8f15aadab87ec439a12e93 (patch) | |
| tree | 1a26f5733ac4eed69c991a8d710d5bee08a7fead /pkgs/top-level | |
| parent | 4936e99d564c7fccd4135c104243ca1e9f4c483a (diff) | |
| parent | 9ab69a3416820df4b499e9a9fe0eb347985fd0c8 (diff) | |
| download | nixlib-b2caceced316877aff8f15aadab87ec439a12e93.tar nixlib-b2caceced316877aff8f15aadab87ec439a12e93.tar.gz nixlib-b2caceced316877aff8f15aadab87ec439a12e93.tar.bz2 nixlib-b2caceced316877aff8f15aadab87ec439a12e93.tar.lz nixlib-b2caceced316877aff8f15aadab87ec439a12e93.tar.xz nixlib-b2caceced316877aff8f15aadab87ec439a12e93.tar.zst nixlib-b2caceced316877aff8f15aadab87ec439a12e93.zip | |
Merge pull request #27354 from TomSmeets/androidstudio-3.0
android-studio-preview: init at 3.0.0.5 canary 6
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3a9912087359..83c92b639727 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13306,11 +13306,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 {}; |