ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-12 03:56:17 +03:00
Code Issues Projects Releases Wiki Activity

Make the "openjdk7" attribute work on Darwin

Browse Source
This commit is contained in:
Eelco Dolstra 2015-09-14 19:21:28 +02:00
parent acd97de64d
commit ef490c6b14
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4135,17 +4135,19 @@ let
path64 = callPackage ../development/compilers/path64 { };
openjdk-darwin = callPackage ../development/compilers/openjdk-darwin { };
openjdk7 = callPackage ../development/compilers/openjdk/7.nix {
bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "7"; };
};
openjdk7 =
if stdenv.isDarwin then
callPackage ../development/compilers/openjdk-darwin { }
else
callPackage ../development/compilers/openjdk/7.nix {
bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "7"; };
};
openjdk8 = callPackage ../development/compilers/openjdk/8.nix {
bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "8"; };
};
openjdk = if stdenv.isDarwin then openjdk-darwin else openjdk8;
openjdk = if stdenv.isDarwin then openjdk7 else openjdk8;
jdk7 = openjdk7 // { outputs = [ "out" ]; };
jre7 = lib.setName "openjre-${lib.getVersion pkgs.openjdk7.jre}" (openjdk7.jre // { outputs = [ "jre" ]; });