diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-09-14 19:21:28 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-09-14 19:21:28 +0200 |
| commit | ef490c6b14a7394744ce333a0f6f5f1cc7b6e5a9 (patch) | |
| tree | 18e7411c5f40a3a42bd0a35759568f2548799ee7 /pkgs | |
| parent | acd97de64da961db3cb3dc6b1c3c1efe1e4d20e6 (diff) | |
| download | nixlib-ef490c6b14a7394744ce333a0f6f5f1cc7b6e5a9.tar nixlib-ef490c6b14a7394744ce333a0f6f5f1cc7b6e5a9.tar.gz nixlib-ef490c6b14a7394744ce333a0f6f5f1cc7b6e5a9.tar.bz2 nixlib-ef490c6b14a7394744ce333a0f6f5f1cc7b6e5a9.tar.lz nixlib-ef490c6b14a7394744ce333a0f6f5f1cc7b6e5a9.tar.xz nixlib-ef490c6b14a7394744ce333a0f6f5f1cc7b6e5a9.tar.zst nixlib-ef490c6b14a7394744ce333a0f6f5f1cc7b6e5a9.zip | |
Make the "openjdk7" attribute work on Darwin
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 484855cfd5a8..5912643c94a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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" ]; }); |