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
This commit is contained in:
commit
53f421c0c4
|
@ -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";
|
||||||
};
|
};
|
||||||
|
|
|
@ -499,6 +499,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 { };
|
||||||
|
|
||||||
adapta-gtk-theme = callPackage ../misc/themes/adapta { };
|
adapta-gtk-theme = callPackage ../misc/themes/adapta { };
|
||||||
|
@ -12865,7 +12867,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 { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue