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

openjdk: stop defaulting Darwin to version 7

Browse Source 
Let's just be consistent with 8. At some point we'll get a proper build
of it from source but until then we might as well standardize on 8, which
has been out for years now and seems to work fine on Darwin.
This commit is contained in:
Dan Peebles 2017-03-08 23:28:45 -05:00
parent dc94d1a2b5
commit ccf7640a4b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/top-level/all-packages.nix
View File

@ -5230,7 +5230,7 @@ with pkgs;
inherit (gnome2) GConf gnome_vfs;
};
openjdk = if stdenv.isDarwin then openjdk7 else openjdk8;
openjdk = openjdk8;
jdk7 = openjdk7 // { outputs = [ "out" ]; };
jre7 = lib.setName "openjre-${lib.getVersion pkgs.openjdk7.jre}"
@ -5247,9 +5247,9 @@ with pkgs;
(lib.addMetaAttrs { outputsToInstall = [ "jre" ]; }
((openjdk8.override { minimal = true; }).jre // { outputs = [ "jre" ]; }));
jdk = if stdenv.isDarwin then jdk7 else jdk8;
jre = if stdenv.isDarwin then jre7 else jre8;
jre_headless = if stdenv.isDarwin then jre7 else jre8_headless;
jdk = jdk8;
jre = jre8;
jre_headless = jre8_headless;
openshot-qt = callPackage ../applications/video/openshot-qt { };