alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Make the jdk/jre attributes work on Darwin

Browse source
This commit is contained in:
Eelco Dolstra 2015-09-14 20:18:38 +02:00
parent 55004d509a
commit 4e1b21d133
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/top-level/all-packages.nix
View file

@ -4155,8 +4155,8 @@ let
jdk8 = openjdk8 // { outputs = [ "out" ]; };
jre8 = lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}" (openjdk8.jre // { outputs = [ "jre" ]; });
jdk = jdk8;
jre = jre8;
jdk = if stdenv.isDarwin then jdk7 else jdk8;
jre = if stdenv.isDarwin then jre7 else jre8;
oraclejdk = pkgs.jdkdistro true false;