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 | |
| 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
| -rw-r--r-- | pkgs/applications/editors/idea/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index 5abbcb37042f..4528a6780d60 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -31,7 +31,8 @@ let buildInputs = x.buildInputs ++ [ makeWrapper ]; installPhase = x.installPhase + '' 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}"; - version = "2.1.1.0"; + version = "2.1.2.0"; build = "AI-${buildNumber}"; description = "Android development environment based on IntelliJ IDEA"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://dl.google.com/dl/android/studio/ide-zips/${version}" + "/android-studio-ide-${buildNumber}-linux.zip"; - sha256 = "1zxxzyhny7j4vzlydrhwz3g8l8zcml84mhkcf5ckx8xr50j3m101"; + sha256 = "0q61m8yln77valg7y6lyxlml53z387zh6fyfgc22sm3br5ahbams"; }; wmClass = "jetbrains-studio"; }; 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 { }; |