JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
47,253 Commits 2 Branches 0 Tags 12 GiB
f39f67b871
Commit Graph

120 Commits

Author SHA1 Message Date
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Eelco Dolstra
b4c971b14a openjdk: Update to 7u65-b32 2014-07-17 13:09:20 +02:00
Eelco Dolstra
1b391e6bf9 openjdk: Set more informative version string 
Also, disable full debug symbols. Don't know if this matters because
we're already stripping everything.
 2014-07-08 18:35:40 +02:00
Eelco Dolstra
639f117ec4 openjdk: Update to 7u60-b30 2014-07-08 18:35:40 +02:00
Eelco Dolstra
c4877df388 openjdk: Drop dependency on CUPS 
We only need the CUPS headers, not the whole package.
 2014-07-08 18:35:40 +02:00
Ricardo M. Correia
6021ce8b83 openjdk: Add support for grsecurity 2014-05-15 13:25:49 +02:00
Ricardo M. Correia
df503a2ad4 openjdkBootstrap: Add support for grsecurity 2014-05-15 13:25:49 +02:00
Eelco Dolstra
981cac8e10 openjdk: Hackery to ensure that tools.jar is found 
HotSpot uses the absolute path of libjvm.so to determine the java.home
property (ignoring $JAVA_HOME), which is in turn used by
ToolProvider.getSystemJavaCompiler() to load tools.jar.  So we need to
do some trickery to ensure that if java gets invoked from the jdk
output (ratherthan the jre output), it finds libjvm.so in the jdk output.
 2014-01-25 03:04:46 +01:00
Vladimír Čunát
0a58b512cb Merge master into stdenv-updates 
Conflicts (simple):
	pkgs/development/compilers/gcc/4.8/default.nix
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/libraries/gmp/5.1.1.nix
	pkgs/development/libraries/gmp/5.1.3.nix
	pkgs/development/libraries/gmp/5.1.x.nix
	pkgs/top-level/all-packages.nix
 2014-01-18 14:46:20 +01:00
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
Vladimír Čunát
e740b565cf Merge master into stdenv-updates 
Conflicts (easy):
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/compilers/openjdk/default.nix
	pkgs/development/libraries/icu/default.nix
	pkgs/development/libraries/libssh/default.nix
	pkgs/development/libraries/libxslt/default.nix
	pkgs/development/tools/parsing/bison/3.x.nix
 2013-12-29 10:01:22 +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
Vladimír Čunát
8ba92b8895 Merge master into stdenv-updates 
Conflicts (simple):
	pkgs/development/tools/misc/binutils/default.nix
	pkgs/tools/package-management/disnix/default.nix
	pkgs/top-level/all-packages.nix
 2013-07-08 10:48:05 +02:00
James Cook
5be89ac733 openjdk: Don't statically link C++ runtime, close #730. 
This fixes a build error (https://github.com/NixOS/nixpkgs/issues/707).
Thanks to
http://mail.openjdk.java.net/pipermail/build-dev/2012-January/005349.html
 2013-07-08 09:15:33 +02:00
Eelco Dolstra
acba9240cd nixos.org/tarballs -> tarballs.nixos.org 
It's currently the same machine, but tarballs.nixos.org should become
an S3/CloudFront site eventually.
 2013-06-25 14:12:16 +02: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
84e1da4b09 openjdk bootstrap tarballs are on nixos.org now. 2012-08-25 17:55:21 -04:00
Shea Levy
228c35f0b2 openjdk: Build from bootstrap 2012-08-24 23:05:41 -04:00
Shea Levy
a4b39fac65 openjdk-bootstrap: nukerefs the whole thing and put it in a tarball 2012-08-24 08:30:48 -04:00
Shea Levy
6ed6d1c5c0 Add expression to create an openjdk bootstrap capable of building the full openjdk 2012-08-23 23:07:38 -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