MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 14:54:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'openjdk-default' of github.com:shlevy/nixpkgs

Browse source 
With this change, java packages will build with openjdk by default. The
primary driver for this is legal: The build farm is not allowed to
distribute the proprietary Oracle jdk6, and so it is not allowed to
distribute any packages that depend on it. In my view, this is a purely
beneficial change: from the perspective of the build farm, packages will
go from undistributable due to licensing to either distributable or
undistributable due to failed build (if the package doesn't build
properly with openjdk), and from the perspective of the end user it is
very easy to override the jdk on a package-by-package basis or for all
of nixpkgs in the nixpkgs configuration.
This commit is contained in:
Shea Levy 2012-08-27 11:26:46 -04:00
commit 488f46c19c
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/top-level/all-packages.nix
View file

@ -2359,8 +2359,12 @@ let
jreOnly = true;
};
jdk = if stdenv.isDarwin then openjdk else jdkdistro true false;
jre = jdkdistro false false;
jdk = if (stdenv.isDarwin || stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux")
then openjdk
else jdkdistro true false;
jre = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux")
then openjre
else jdkdistro false false;
jrePlugin = lowPrio (jdkdistro false true);