diff options
| author | zimbatm <zimbatm@zimbatm.com> | 2016-06-19 22:30:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-19 22:30:34 +0100 |
| commit | 53f421c0c4b4916426c369bfb996422209e6ebf7 (patch) | |
| tree | 58ac6775f9a38880ef1cd75a9ffa79d4f64ee472 /pkgs/top-level | |
| parent | 7795f11335383cafbf3d4526c49cdae94fe4de15 (diff) | |
| parent | 3cca6c69605c3bcf1166a36ac19439aaa98249e9 (diff) | |
| download | nixlib-53f421c0c4b4916426c369bfb996422209e6ebf7.tar nixlib-53f421c0c4b4916426c369bfb996422209e6ebf7.tar.gz nixlib-53f421c0c4b4916426c369bfb996422209e6ebf7.tar.bz2 nixlib-53f421c0c4b4916426c369bfb996422209e6ebf7.tar.lz nixlib-53f421c0c4b4916426c369bfb996422209e6ebf7.tar.xz nixlib-53f421c0c4b4916426c369bfb996422209e6ebf7.tar.zst nixlib-53f421c0c4b4916426c369bfb996422209e6ebf7.zip | |
Merge pull request #16325 from taku0/android-studio-2.1.2.0
android-studio: 2.1.1.0 -> 2.1.2.0, fixed Gradle link error
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9e3c5f7b01a8..7a5057e1c7be 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -499,6 +499,8 @@ in androidsdk = self.androidenv.androidsdk_6_0; + androidsdk_extras = self.androidenv.androidsdk_6_0_extras; + arc-gtk-theme = callPackage ../misc/themes/arc { }; adapta-gtk-theme = callPackage ../misc/themes/adapta { }; @@ -12865,7 +12867,7 @@ in libart = pkgs.gnome2.libart_lgpl; }; - idea = recurseIntoAttrs (callPackages ../applications/editors/idea { androidsdk = androidsdk_4_4; }); + idea = recurseIntoAttrs (callPackages ../applications/editors/idea { androidsdk = androidsdk_extras; }); libquvi = callPackage ../applications/video/quvi/library.nix { }; |