From 3cca6c69605c3bcf1166a36ac19439aaa98249e9 Mon Sep 17 00:00:00 2001 From: taku0 Date: Sun, 19 Jun 2016 12:07:50 +0900 Subject: 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 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'pkgs/applications/editors/idea') 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"; }; -- cgit 1.4.1 From e945646be3a045948801ff7262bec11a7b9315b3 Mon Sep 17 00:00:00 2001 From: Edward Tjörnhammar Date: Tue, 21 Jun 2016 11:07:56 +0200 Subject: idea: make jdk overrideable using .override MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Edward Tjörnhammar --- pkgs/applications/editors/idea/common.nix | 4 ++-- pkgs/applications/editors/idea/default.nix | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'pkgs/applications/editors/idea') diff --git a/pkgs/applications/editors/idea/common.nix b/pkgs/applications/editors/idea/common.nix index 556b333ce757..170a12d6d695 100644 --- a/pkgs/applications/editors/idea/common.nix +++ b/pkgs/applications/editors/idea/common.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeDesktopItem, makeWrapper, patchelf, p7zip -, coreutils, gnugrep, which, git, python, unzip, jdk }: +, coreutils, gnugrep, which, git, python, unzip }: -{ name, product, version, build, src, wmClass, meta } @ attrs: +{ name, product, version, build, src, wmClass, jdk, meta } @ attrs: with stdenv.lib; diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index 4528a6780d60..6ef4edb53620 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -12,7 +12,7 @@ let buildAndroidStudio = { name, version, build, src, license, description, wmClass }: let drv = (mkIdeaProduct rec { - inherit name version build src wmClass; + inherit name version build src wmClass jdk; product = "Studio"; meta = with stdenv.lib; { homepage = https://developer.android.com/sdk/installing/studio.html; @@ -38,7 +38,7 @@ let buildClion = { name, version, build, src, license, description, wmClass }: (mkIdeaProduct rec { - inherit name version build src wmClass; + inherit name version build src wmClass jdk; product = "CLion"; meta = with stdenv.lib; { homepage = "https://www.jetbrains.com/clion/"; @@ -54,7 +54,7 @@ let buildIdea = { name, version, build, src, license, description, wmClass }: (mkIdeaProduct rec { - inherit name version build src wmClass; + inherit name version build src wmClass jdk; product = "IDEA"; meta = with stdenv.lib; { homepage = "https://www.jetbrains.com/idea/"; @@ -71,7 +71,7 @@ let buildRubyMine = { name, version, build, src, license, description, wmClass }: (mkIdeaProduct rec { - inherit name version build src wmClass; + inherit name version build src wmClass jdk; product = "RubyMine"; meta = with stdenv.lib; { homepage = "https://www.jetbrains.com/ruby/"; @@ -84,7 +84,7 @@ let buildPhpStorm = { name, version, build, src, license, description, wmClass }: (mkIdeaProduct { - inherit name version build src wmClass; + inherit name version build src wmClass jdk; product = "PhpStorm"; meta = with stdenv.lib; { homepage = "https://www.jetbrains.com/phpstorm/"; @@ -101,7 +101,7 @@ let buildWebStorm = { name, version, build, src, license, description, wmClass }: (mkIdeaProduct { - inherit name version build src wmClass; + inherit name version build src wmClass jdk; product = "WebStorm"; meta = with stdenv.lib; { homepage = "https://www.jetbrains.com/webstorm/"; @@ -118,7 +118,7 @@ let buildPycharm = { name, version, build, src, license, description, wmClass }: (mkIdeaProduct rec { - inherit name version build src wmClass; + inherit name version build src wmClass jdk; product = "PyCharm"; meta = with stdenv.lib; { homepage = "https://www.jetbrains.com/pycharm/"; -- cgit 1.4.1