Commit graph

104 commits

Author SHA1 Message Date
Eelco Dolstra
cda63e94c3 openjdk: Fix setting $JAVA_HOME 2014-01-14 10:47:08 +01:00
Eelco Dolstra
4775dee8b9 openjdk: Set JAVA_HOME in a setup-hook 2014-01-09 12:50:38 +01:00
Eelco Dolstra
90e533b685 openjre: Propagate setJavaClassPath
Thus, any package that has the JRE or JDK in its build inputs will
automatically have $CLASSPATH set up properly.
2014-01-06 14:36:14 +01:00
Eelco Dolstra
79675fad6e openjdk: Use multiple outputs
This unifies the "openjdk" and "openjre" packages.  The JDK is placed
in the "out" output, the JRE in "jre".

Also, everything is now stored in $prefix/lib/openjdk, so the JDK/JRE
no longer pollute user environments with files like
"ASSEMBLY_EXCEPTION" at top-level.
2014-01-03 11:56:40 +01:00
Eelco Dolstra
7f11ef6345 openjdk: Skip configurePhase
The build phase also runs "make sanity", so there is no need to do it
twice.
2014-01-03 11:56:40 +01:00
Eelco Dolstra
7edfe92f5f openjdk: Fix manpage cleanup 2014-01-03 11:56:40 +01:00
Eelco Dolstra
02f7e85d99 openjdk: Remove obsolete header file hack 2014-01-03 11:56:40 +01:00
Eelco Dolstra
e76c334756 openjdk: Remove some unnecessary stuff from the installation 2013-12-20 18:29:07 +01:00
Eelco Dolstra
778539e871 openjdk: Update to 7u40b43 2013-12-20 18:29:06 +01:00
Shea Levy
eb6c8aec62 openjdk: Update to 7u6b24 2013-01-22 12:58:07 -05:00
Eelco Dolstra
bce3c6db7e openjdk: Fix typo in the version 2012-11-29 16:32:37 +01:00
Shea Levy
e8cd81a055 openjdk: Install the unlimited crypto policy 2012-11-08 14:51:23 -05:00
Michael Raskin
5e071cd74d OK, this version definitely builds both ways 2012-10-26 13:19:54 +04:00
Michael Raskin
e7493370bd Account for difference between JRE and JDK in build 2012-10-26 12:11:00 +04:00
Michael Raskin
e862c150f0 Trying to fix OpenJDK build 2012-10-26 11:06:25 +04:00
Shea Levy
a234280340 openjdk: Create a cacerts file from pkgs.cacerts 2012-10-25 23:33:09 -04:00
Shea Levy
5150b55bf2 openjdk: Add lib{fontconfig,Xcursor,Xinerama} to rpaths. 2012-10-09 11:11:19 -04:00
Shea Levy
a08ca4c04a openjdk: Don't use the official build system's boostrapping, do our own.
The openjdk BOOT_CYCLE bootstrap doesn't use the binaries built in the first stage for the second stage, so we get a bunch of errors like:
  /bin/sh: /nix/store/wdgl7xl9b72hn212l0672ad5sn7vh44y-openjdk-bootstrap/bin/native2ascii: No such file or directory
Instead, just build each stage as a separate derivation
2012-10-04 16:56:41 -04:00
Shea Levy
f4bc57feba openjdk: passthru the architecture attribute like oracle jdk6 does. 2012-08-27 12:41:13 -04:00
Shea Levy
228c35f0b2 openjdk: Build from bootstrap 2012-08-24 23:05:41 -04:00
Eelco Dolstra
c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00:00
Shea Levy
5b3aa1f8ec openjdk: Remove extraneous whitespace
svn path=/nixpkgs/trunk/; revision=28804
2011-08-24 22:52:16 +00:00
Shea Levy
5040530375 openjdk: Only builds on linux for now
svn path=/nixpkgs/trunk/; revision=28495
2011-08-11 14:48:06 +00:00
Shea Levy
b6d81d67d8 openjdk: Comment out the multiple outputs stuff for now
svn path=/nixpkgs/trunk/; revision=28494
2011-08-11 13:35:20 +00:00
Shea Levy
bff57396f5 openjdk: Add a fix for versions of nix not yet supporting multiple outputs
svn path=/nixpkgs/trunk/; revision=28493
2011-08-11 13:27:43 +00:00
Shea Levy
e5a6f2702b openjdk: Add the 'jre' output.
Note that this is almost completely useless for now, when openjdk is built a separate store path containing only the jre will be built but it will not be added to the environment nor as a gc root. If you want to install just the jre, for now build openjre (which uses the jreOnly parameter). Once multiple outputs are more feature-complete, this should hopefully be useful and remove the need for the jreOnly parameter

svn path=/nixpkgs/trunk/; revision=28481
2011-08-11 02:29:10 +00:00
Shea Levy
fbb50e0f6d openjdk: Use the proper format for BUILD_NUMBER
svn path=/nixpkgs/trunk/; revision=28480
2011-08-11 01:13:12 +00:00
Shea Levy
93548e648e openjdk: Add a patch to fix a stupid linux version check
Hopefully by the time the Linux 4.x series drops we'll have a better openjdk build system

svn path=/nixpkgs/trunk/; revision=28479
2011-08-11 01:13:04 +00:00
Shea Levy
11ae27db30 openjdk: Add jaf sources to the drops dir
svn path=/nixpkgs/trunk/; revision=28478
2011-08-11 01:12:55 +00:00
Shea Levy
ab5fc0fe11 openjdk: Download source drops ahead of time instead of allowing downloads during build
The openjdk build docs say that the releases should contain these drops, but they don't for some reason.

svn path=/nixpkgs/trunk/; revision=28477
2011-08-11 01:12:46 +00:00
Shea Levy
163260b946 openjdk: Add platforms meta attribute
svn path=/nixpkgs/trunk/; revision=28476
2011-08-11 01:12:37 +00:00
Shea Levy
c497c19c46 openjre: Call the derivation openjre instead of openjdk
svn path=/nixpkgs/trunk/; revision=28118
2011-08-01 18:48:10 +00:00
Shea Levy
02083734d1 Add openjre
svn path=/nixpkgs/trunk/; revision=28117
2011-08-01 18:48:01 +00:00
Shea Levy
9023f52855 openjdk: Don't delete src.zip, it comes with the binary distribution too
svn path=/nixpkgs/trunk/; revision=28115
2011-08-01 17:51:59 +00:00
Shea Levy
6a74987ad4 openjdk: Fix mistakenly erased square bracket
Not sure how that happend...

svn path=/nixpkgs/trunk/; revision=28100
2011-08-01 02:59:22 +00:00
Shea Levy
84529a1370 openjdk: Add meta attributes
svn path=/nixpkgs/trunk/; revision=28099
2011-08-01 01:17:42 +00:00
Shea Levy
31b09ab695 openjdk: Install build results to $out
svn path=/nixpkgs/trunk/; revision=28098
2011-08-01 01:17:33 +00:00
Shea Levy
572edb6f68 openjdk: Add patch to fix 'printf: --: invalid option' error
Thanks to http://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg510739.html for the fix

svn path=/nixpkgs/trunk/; revision=28097
2011-08-01 01:17:25 +00:00
Shea Levy
43cb8fb149 openjdk: Add cpio to buildInputs
svn path=/nixpkgs/trunk/; revision=28096
2011-08-01 01:17:16 +00:00
Shea Levy
ec41a120fb openjdk: Add patch to avoid an empty -I flag
svn path=/nixpkgs/trunk/; revision=28095
2011-08-01 01:17:08 +00:00
Shea Levy
0e9cda68fc openjdk: Fix an Xrender.h include
svn path=/nixpkgs/trunk/; revision=28094
2011-08-01 01:16:59 +00:00
Shea Levy
c6cf3e563e Add libXi to buildInputs
svn path=/nixpkgs/trunk/; revision=28093
2011-08-01 01:16:50 +00:00
Shea Levy
09567b5caf Add libXtst to buildInputs
svn path=/nixpkgs/trunk/; revision=28092
2011-08-01 01:16:42 +00:00
Shea Levy
e2f7b2087c Add libXrender to buildInputs
svn path=/nixpkgs/trunk/; revision=28091
2011-08-01 01:16:35 +00:00
Shea Levy
fb896f62dd Add libXext to buildInputs
svn path=/nixpkgs/trunk/; revision=28090
2011-08-01 01:16:27 +00:00
Shea Levy
6ce3f32da2 Add libXt to buildInputs
svn path=/nixpkgs/trunk/; revision=28089
2011-08-01 01:16:19 +00:00
Shea Levy
2e0252011d Add libX11 to buildInputs
svn path=/nixpkgs/trunk/; revision=28088
2011-08-01 01:16:10 +00:00
Shea Levy
9e06eb71d6 Add alsaLib to buildInputs
svn path=/nixpkgs/trunk/; revision=28087
2011-08-01 01:16:02 +00:00
Shea Levy
e052a36daf openjdk: Use the /bin/echo sed on the corba makefiles too
svn path=/nixpkgs/trunk/; revision=28086
2011-08-01 01:15:53 +00:00
Shea Levy
635dd9aac5 openjdk: Combine two seds into one
svn path=/nixpkgs/trunk/; revision=28085
2011-08-01 01:15:45 +00:00