diff options
| author | Gabriel Ebner <gebner@gebner.org> | 2016-01-23 13:22:07 +0100 |
|---|---|---|
| committer | Gabriel Ebner <gebner@gebner.org> | 2016-01-23 13:39:15 +0100 |
| commit | a8d6ad8690e22bc1961c4efce4b8cdb534077606 (patch) | |
| tree | 1e5cf8d4b076cbf3644a4a9433a769d1c6929ae4 | |
| parent | openjdk8: do not symlink icc profiles (diff) | |
| download | nixpkgs-a8d6ad8690e22bc1961c4efce4b8cdb534077606.tar.gz | |
idea: use openjdk8 again
| -rw-r--r-- | pkgs/applications/editors/idea/common.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/editors/idea/default.nix | 9 |
2 files changed, 4 insertions, 9 deletions
diff --git a/pkgs/applications/editors/idea/common.nix b/pkgs/applications/editors/idea/common.nix index 96689fa75ad6..36f600c14860 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, androidsdk }: +, coreutils, gnugrep, which, git, python, unzip, jdk }: -{ name, product, version, build, src, meta, jdk } @ attrs: +{ name, product, version, build, src, meta } @ attrs: with stdenv.lib; diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index 1f1dee8d197a..acc3a75cca10 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -1,6 +1,6 @@ { stdenv, callPackage, fetchurl, makeDesktopItem, makeWrapper, patchelf , coreutils, gnugrep, which, git, python, unzip, p7zip -, androidsdk, jdk, oraclejdk8 +, androidsdk, jdk }: assert stdenv.isLinux; @@ -8,12 +8,7 @@ assert stdenv.isLinux; let bnumber = with stdenv.lib; build: last (splitString "-" build); - mkIdeaProduct' = callPackage ./common.nix { }; - mkIdeaProduct = attrs: mkIdeaProduct' ({ - # After IDEA 15 we can no longer use OpenJDK. - # https://youtrack.jetbrains.com/issue/IDEA-147272 - jdk = if (bnumber attrs.build) < "143" then jdk else oraclejdk8; - } // attrs); + mkIdeaProduct = callPackage ./common.nix { }; buildAndroidStudio = { name, version, build, src, license, description }: let drv = (mkIdeaProduct rec { |