diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-09-14 20:18:38 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-09-14 20:18:44 +0200 |
| commit | 4e1b21d133821f5eddf299bcd3962a17a2771e78 (patch) | |
| tree | e52e3ab32f34e9d617a0f96c20e79aa31ee01a16 | |
| parent | 55004d509ab4120818938e12c13ca338d42179c6 (diff) | |
| download | nixpkgs-4e1b21d133821f5eddf299bcd3962a17a2771e78.tar nixpkgs-4e1b21d133821f5eddf299bcd3962a17a2771e78.tar.gz nixpkgs-4e1b21d133821f5eddf299bcd3962a17a2771e78.tar.bz2 nixpkgs-4e1b21d133821f5eddf299bcd3962a17a2771e78.tar.lz nixpkgs-4e1b21d133821f5eddf299bcd3962a17a2771e78.tar.xz nixpkgs-4e1b21d133821f5eddf299bcd3962a17a2771e78.tar.zst nixpkgs-4e1b21d133821f5eddf299bcd3962a17a2771e78.zip | |
Make the jdk/jre attributes work on Darwin
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5912643c94a..f17a202daa1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4155,8 +4155,8 @@ let jdk8 = openjdk8 // { outputs = [ "out" ]; }; jre8 = lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}" (openjdk8.jre // { outputs = [ "jre" ]; }); - jdk = jdk8; - jre = jre8; + jdk = if stdenv.isDarwin then jdk7 else jdk8; + jre = if stdenv.isDarwin then jre7 else jre8; oraclejdk = pkgs.jdkdistro true false; |