Make jdk / jre derivations installable
This commit is contained in:
parent
9d88a15ab4
commit
93ddc18a59
@ -3945,23 +3945,28 @@ let
|
||||
openjdk7 = callPackage ../development/compilers/openjdk {
|
||||
bootjdk = openjdk7-bootstrap;
|
||||
};
|
||||
openjdk7_jre = openjdk7.jre;
|
||||
openjdk7_jdk = openjdk7 // { outputs = [ "out" ]; };
|
||||
openjdk7_jre = openjdk7 // { outputs = [ "jre" ]; };
|
||||
|
||||
openjdk8 = callPackage ../development/compilers/openjdk/openjdk8.nix {
|
||||
bootjdk = openjdk8-bootstrap;
|
||||
};
|
||||
openjdk8_jre = openjdk8.jre;
|
||||
openjdk8_jdk = openjdk8 // { outputs = [ "out" ]; };
|
||||
openjdk8_jre = openjdk8 // { outputs = [ "jre" ]; };
|
||||
|
||||
openjdk = if stdenv.isDarwin then openjdk-darwin else openjdk8;
|
||||
|
||||
jdk7 = openjdk7;
|
||||
jre7 = jdk7.jre;
|
||||
java7 = openjdk7;
|
||||
jdk7 = java7 // { outputs = [ "out" ]; };
|
||||
jre7 = java7 // { outputs = [ "jre" ]; };
|
||||
|
||||
jdk8 = openjdk8;
|
||||
jre8 = jdk8.jre;
|
||||
java8 = openjdk8;
|
||||
jdk8 = java8 // { outputs = [ "out" ]; };
|
||||
jre8 = java8 // { outputs = [ "jre" ]; };
|
||||
|
||||
jdk = if stdenv.isDarwin then openjdk-darwin else jdk8;
|
||||
jre = jdk.jre;
|
||||
java = if stdenv.isDarwin then openjdk-darwin else jdk8;
|
||||
jdk = java // { outputs = [ "out" ]; };
|
||||
jre = java // { outputs = [ "jre" ]; };
|
||||
|
||||
oraclejdk = pkgs.jdkdistro true false;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user