public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

idea: use openjdk8 again

This commit is contained in:
Gabriel Ebner 2016-01-23 13:22:07 +01:00
parent b47d2f8029
commit a8d6ad8690
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/editors/idea/common.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, makeDesktopItem, makeWrapper, patchelf, p7zip { 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; with stdenv.lib;

9
pkgs/applications/editors/idea/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, callPackage, fetchurl, makeDesktopItem, makeWrapper, patchelf { stdenv, callPackage, fetchurl, makeDesktopItem, makeWrapper, patchelf
, coreutils, gnugrep, which, git, python, unzip, p7zip , coreutils, gnugrep, which, git, python, unzip, p7zip
, androidsdk, jdk, oraclejdk8 , androidsdk, jdk
}: }:
assert stdenv.isLinux; assert stdenv.isLinux;
@ -8,12 +8,7 @@ assert stdenv.isLinux;
let let
bnumber = with stdenv.lib; build: last (splitString "-" build); bnumber = with stdenv.lib; build: last (splitString "-" build);
mkIdeaProduct' = callPackage ./common.nix { }; 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);
buildAndroidStudio = { name, version, build, src, license, description }: buildAndroidStudio = { name, version, build, src, license, description }:
let drv = (mkIdeaProduct rec { let drv = (mkIdeaProduct rec {