mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-29 17:10:48 +00:00
Code Issues Wiki Activity

java: Fix jre derivations

Browse source
This commit is contained in:
William A. Kennington III 2015-06-10 15:33:22 -07:00
parent 1c3585e411
commit bb23251c90
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3946,27 +3946,27 @@ let
bootjdk = openjdk7-bootstrap; bootjdk = openjdk7-bootstrap;
}; };
openjdk7_jdk = openjdk7 // { outputs = [ "out" ]; }; openjdk7_jdk = openjdk7 // { outputs = [ "out" ]; };
openjdk7_jre = openjdk7 // { outputs = [ "jre" ]; }; openjdk7_jre = openjdk7.jre // { outputs = [ "jre" ]; };
openjdk8 = callPackage ../development/compilers/openjdk/openjdk8.nix { openjdk8 = callPackage ../development/compilers/openjdk/openjdk8.nix {
bootjdk = openjdk8-bootstrap; bootjdk = openjdk8-bootstrap;
}; };
openjdk8_jdk = openjdk8 // { outputs = [ "out" ]; }; openjdk8_jdk = openjdk8 // { outputs = [ "out" ]; };
openjdk8_jre = openjdk8 // { outputs = [ "jre" ]; }; openjdk8_jre = openjdk8.jre // { outputs = [ "jre" ]; };
openjdk = if stdenv.isDarwin then openjdk-darwin else openjdk8; openjdk = if stdenv.isDarwin then openjdk-darwin else openjdk8;
java7 = openjdk7; java7 = openjdk7;
jdk7 = java7 // { outputs = [ "out" ]; }; jdk7 = java7 // { outputs = [ "out" ]; };
jre7 = java7 // { outputs = [ "jre" ]; }; jre7 = java7.jre // { outputs = [ "jre" ]; };
java8 = openjdk8; java8 = openjdk8;
jdk8 = java8 // { outputs = [ "out" ]; }; jdk8 = java8 // { outputs = [ "out" ]; };
jre8 = java8 // { outputs = [ "jre" ]; }; jre8 = java8.jre // { outputs = [ "jre" ]; };
java = if stdenv.isDarwin then openjdk-darwin else jdk8; java = if stdenv.isDarwin then openjdk-darwin else jdk8;
jdk = java // { outputs = [ "out" ]; }; jdk = java // { outputs = [ "out" ]; };
jre = java // { outputs = [ "jre" ]; }; jre = java.jre // { outputs = [ "jre" ]; };
oraclejdk = pkgs.jdkdistro true false; oraclejdk = pkgs.jdkdistro true false;