android-studio: 2.1.1.0 -> 2.1.2.0, fixed Gradle link error

- Set `LD_LIBRARY_PATH` because Gradle installs `libnative-platform.so` in `~/.gradle`, that requires `libstdc++.so.6`
- Uses Android SDK with support libraries since standard templates use them.
- Version bump
This commit is contained in:
taku0 2016-06-19 12:07:50 +09:00
parent 304034518f
commit 3cca6c6960
2 changed files with 8 additions and 5 deletions

View file

@ -31,7 +31,8 @@ let
buildInputs = x.buildInputs ++ [ makeWrapper ]; buildInputs = x.buildInputs ++ [ makeWrapper ];
installPhase = x.installPhase + '' installPhase = x.installPhase + ''
wrapProgram "$out/bin/android-studio" \ wrapProgram "$out/bin/android-studio" \
--set ANDROID_HOME "${androidsdk}/libexec/android-sdk-linux/" --set ANDROID_HOME "${androidsdk}/libexec/android-sdk-linux/" \
--set LD_LIBRARY_PATH "${stdenv.cc.cc.lib}/lib" # Gradle installs libnative-platform.so in ~/.gradle, that requires libstdc++.so.6
''; '';
}); });
@ -146,16 +147,16 @@ in
{ {
android-studio = let buildNumber = "143.2821654"; in buildAndroidStudio rec { android-studio = let buildNumber = "143.2915827"; in buildAndroidStudio rec {
name = "android-studio-${version}"; name = "android-studio-${version}";
version = "2.1.1.0"; version = "2.1.2.0";
build = "AI-${buildNumber}"; build = "AI-${buildNumber}";
description = "Android development environment based on IntelliJ IDEA"; description = "Android development environment based on IntelliJ IDEA";
license = stdenv.lib.licenses.asl20; license = stdenv.lib.licenses.asl20;
src = fetchurl { src = fetchurl {
url = "https://dl.google.com/dl/android/studio/ide-zips/${version}" + url = "https://dl.google.com/dl/android/studio/ide-zips/${version}" +
"/android-studio-ide-${buildNumber}-linux.zip"; "/android-studio-ide-${buildNumber}-linux.zip";
sha256 = "1zxxzyhny7j4vzlydrhwz3g8l8zcml84mhkcf5ckx8xr50j3m101"; sha256 = "0q61m8yln77valg7y6lyxlml53z387zh6fyfgc22sm3br5ahbams";
}; };
wmClass = "jetbrains-studio"; wmClass = "jetbrains-studio";
}; };

View file

@ -495,6 +495,8 @@ in
androidsdk = self.androidenv.androidsdk_6_0; androidsdk = self.androidenv.androidsdk_6_0;
androidsdk_extras = self.androidenv.androidsdk_6_0_extras;
arc-gtk-theme = callPackage ../misc/themes/arc { }; arc-gtk-theme = callPackage ../misc/themes/arc { };
aria2 = callPackage ../tools/networking/aria2 { aria2 = callPackage ../tools/networking/aria2 {
@ -12844,7 +12846,7 @@ in
libart = pkgs.gnome2.libart_lgpl; 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 { }; libquvi = callPackage ../applications/video/quvi/library.nix { };