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

Make "nix-env -i openjdk" do the right thing

Browse Source
This commit is contained in:
Eelco Dolstra 2012-11-29 11:31:38 +01:00
parent a4937f9031
commit 2eace0dfe6
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2416,20 +2416,19 @@ let
path64 = callPackage ../development/compilers/path64 { }; 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 = openjdk =
if stdenv.isDarwin then if stdenv.isDarwin then
callPackage ../development/compilers/openjdk-darwin { } callPackage ../development/compilers/openjdk-darwin { }
else else
callPackage ../development/compilers/openjdk { let
jdk = pkgs.openjdkStage1; openjdkBootstrap = callPackage ../development/compilers/openjdk/bootstrap.nix {};
ant = pkgs.ant.override { jdk = pkgs.openjdkStage1; }; 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 { openjre = pkgs.openjdk.override {