From 3cca6c69605c3bcf1166a36ac19439aaa98249e9 Mon Sep 17 00:00:00 2001 From: taku0 Date: Sun, 19 Jun 2016 12:07:50 +0900 Subject: [PATCH] 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 --- pkgs/applications/editors/idea/default.nix | 9 +++++---- 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 3b3f3e5cfcb5..f762e3f01225 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -495,6 +495,8 @@ in androidsdk = self.androidenv.androidsdk_6_0; + androidsdk_extras = self.androidenv.androidsdk_6_0_extras; + arc-gtk-theme = callPackage ../misc/themes/arc { }; aria2 = callPackage ../tools/networking/aria2 { @@ -12844,7 +12846,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 { };