forked from mirrors/nixpkgs
Make "nix-env -i openjdk" do the right thing
This commit is contained in:
parent
a4937f9031
commit
2eace0dfe6
|
@ -2416,20 +2416,19 @@ let
|
|||
|
||||
path64 = callPackage ../development/compilers/path64 { };
|
||||
|
||||
openjdkBootstrap = callPackage ../development/compilers/openjdk/bootstrap.nix {};
|
||||
|
||||
openjdkStage1 = callPackage ../development/compilers/openjdk {
|
||||
jdk = pkgs.openjdkBootstrap;
|
||||
ant = pkgs.ant.override { jdk = pkgs.openjdkBootstrap; };
|
||||
};
|
||||
|
||||
openjdk =
|
||||
if stdenv.isDarwin then
|
||||
callPackage ../development/compilers/openjdk-darwin { }
|
||||
else
|
||||
callPackage ../development/compilers/openjdk {
|
||||
jdk = pkgs.openjdkStage1;
|
||||
ant = pkgs.ant.override { jdk = pkgs.openjdkStage1; };
|
||||
let
|
||||
openjdkBootstrap = callPackage ../development/compilers/openjdk/bootstrap.nix {};
|
||||
openjdkStage1 = callPackage ../development/compilers/openjdk {
|
||||
jdk = openjdkBootstrap;
|
||||
ant = pkgs.ant.override { jdk = openjdkBootstrap; };
|
||||
};
|
||||
in callPackage ../development/compilers/openjdk {
|
||||
jdk = openjdkStage1;
|
||||
ant = pkgs.ant.override { jdk = openjdkStage1; };
|
||||
};
|
||||
|
||||
openjre = pkgs.openjdk.override {
|
||||
|
|
Loading…
Reference in a new issue