nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-17 09:34:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Actually use openjdk8 binary build for x86_64-darwin.

Browse Source 
(cherry picked from commit 73359a3cbe)
This commit is contained in:
Rob Vermaas 2016-01-14 10:31:02 +00:00
parent 5f3e33b8ec
commit 4e9575c314
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4221,9 +4221,13 @@ let
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"; };
};
openjdk8 =
if stdenv.isDarwin then
callPackage ../development/compilers/openjdk-darwin/8.nix { }
else
callPackage ../development/compilers/openjdk/8.nix {
bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "8"; };
};
openjdk = if stdenv.isDarwin then openjdk7 else openjdk8;