Tim Steinbach
e4c38f36dd
openjdk: 8u122-00 -> 8u122-03
2016-10-22 14:27:12 -04:00
Nikolay Amiantov
9d7c9cc32e
openjdk8: add a patch to use GTK when available by default
2016-10-02 23:57:10 +03:00
Nikolay Amiantov
a15c943337
openjdk8: rework dependencies
...
This makes several adjustments around what is linked into JRE.
* system giflib, libjpeg, zlib are now used unconditionally;
* libstdc++ is linked dynamically.
For full version:
* GTK+ and GNOME libraries are linked;
* Extra X11 libraries are linked;
* CUPS is linked;
* libmagic (file) is linked.
For minimal version:
* All X11 support is removed;
* Sound support is removed.
* Fonts and their support are not lined.
jre8_headless is added as a minimal build.
Overall this adds support for all things GUI into the default Java build and
removes them from the minimal build.
2016-10-02 23:57:02 +03:00
Tim Steinbach
83a893c38a
openjdk7: 1.7.0-91 -> 1.7.0-111
2016-09-23 08:45:38 -04:00
reltuk
3e695874e2
openjdk: Keep {include,man} in $out/lib/opendjk. ( #18140 )
...
* openjdk: Keep {include,man} in $out/lib/opendjk.
This is a standard layout that some JDK consumers expect.
* openjdk/8: Improve clarity of some symlink commands with terminating slash.
2016-09-01 21:00:41 +02:00
Tim Steinbach
8a7afae58b
openjdk: Fix #17603
2016-09-01 20:47:19 +02:00
Vladimír Čunát
f616c0f1f0
openjdk7: fix build with glibc-2.24
...
I tested this patch for both versions but I forgot to push
and 8 got fixed in the meantime 44dc95ef5
.
2016-08-20 18:00:10 +02:00
obadz
8856b9e905
openjdk: 8u102b04 -> 8u122b00
2016-08-20 16:32:08 +01:00
obadz
44dc95ef53
openjdk8: add compiler flag to cope with glibc 2.24
2016-08-20 16:32:08 +01:00
Profpatsch
632411c2b6
openjdk7: replace vulnerable cups version ( #17214 )
...
Fixes #7407 .
Also uses the nixpkgs version of cups, not a static one that is never
maintained.
2016-07-28 03:23:21 +02:00
Tim Steinbach
f7ab8f80a0
openjdk: 8u92b14 -> 8u102b04
2016-06-16 22:19:41 +00:00
Tim Steinbach
84bf43a702
openjdk: 8u76 -> 8u92
2016-05-03 00:17:45 +00:00
Vladimír Čunát
ae74c356d9
Merge recent 'staging' into closure-size
...
Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00
Edward Tjörnhammar
e8cc9204a8
Merge pull request #12568 from gebner/idea-openjdk8
...
idea: fix problems with openjdk8
2016-01-24 10:29:54 +01:00
Tobias Geerinckx-Rice
32d40f0f98
Remove no longer (or never) referenced patches
...
55 files changed, 6041 deletions. Tested with `nix-build -A tarball`.
2016-01-24 02:02:21 +01:00
Gabriel Ebner
b47d2f8029
openjdk8: do not symlink icc profiles
2016-01-23 13:22:48 +01:00
Vladimír Čunát
333d69a5f0
Merge staging into closure-size
...
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
William A. Kennington III
a5ea7cd1d1
openjdk: 8u72b04 -> 8u76b00
2015-11-10 18:27:19 -08:00
William A. Kennington III
95c22086a6
openjdk: 7u85b02 -> 7u91b01
2015-11-10 18:26:52 -08:00
Joel Moberg
bd3099ff6f
openjdk: add infinality patch to improve font-rendering
2015-11-03 14:59:16 +01:00
William A. Kennington III
be63d58974
openjdk8: u60b24 -> u72b04
2015-10-24 09:30:36 -07:00
William A. Kennington III
55a4156389
openjdk7: u80b32 -> u85b02
2015-10-24 09:30:35 -07:00
Vladimír Čunát
1a5d465395
openjdk: fix build with multiple outputs
...
It seems freetype can't be found by that flag anymore, after it has been
split, but pkgconfig is a better option anyway (tested it finds it).
2015-10-13 20:18:58 +02:00
Vladimír Čunát
1fdbc3097b
alsa-lib: split "dev" output and fix referrers
2015-10-13 20:18:55 +02:00
Vladimír Čunát
5227fb1dd5
Merge commit staging+systemd into closure-size
...
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
Bryan Gardiner
4140c7fe16
openjdk8: add the architecture passthru from openjdk7
2015-09-16 06:42:22 -07:00
Eelco Dolstra
b0fd35e174
openjdk8: Add missing setup hooks
2015-09-14 18:28:52 +02:00
Eelco Dolstra
7a1aa50908
Rename OpenJDK expressions
...
It's silly to have OpenJDK 7 in default.nix when it's not in fact the
default.
2015-09-14 18:28:48 +02:00
William A. Kennington III
be48876349
openjdk: 8u40b27 -> 8u60b24
2015-07-17 18:00:49 -07:00
Shea Levy
145768bf9b
Unmaintain a bunch of packages
2015-07-01 08:11:05 -04:00
William A. Kennington III
240338638e
openjdk7: Fix refernces to the bootstrap
2015-06-08 13:56:29 -07:00
William A. Kennington III
6e68e874b5
openjdk8: Fix refernces to the bootstrap
2015-06-08 00:00:12 -07:00
William A. Kennington III
a5ef488b11
opendjk: Make boostraps for each major version and update openjdk7
2015-06-07 21:02:02 -07:00
William A. Kennington III
0cc68fa478
openjdk-make-bootstrap: Use openjdk8
2015-06-07 21:02:02 -07:00
William A. Kennington III
bdcb721546
java: Refactor top level and build ordering
2015-06-07 21:02:02 -07:00
William A. Kennington III
ffd0539eba
cacert: store ca-bundle.crt in $out/etc/ssl/certs instead of $out
2015-06-05 13:00:52 -07:00
Pascal Wittmann
d780e48b31
openjdk8: fix build by applying the patch from debian
...
see https://www.mail-archive.com/debian-bugs-rc@lists.debian.org/msg389555.html
closes #8090
2015-05-31 18:02:41 +02:00
William A. Kennington III
14c1e0fa1f
Fix ca-bundle paths
2015-05-29 14:03:34 -07:00
Edward Tjörnhammar
e48f5bc198
openjdk8: readd symlinks and remove useless makeflags
2015-05-20 01:55:34 +02:00
Edward Tjörnhammar
69d1f7630c
openjdk8: 40b25 -> 40b27
2015-05-19 22:43:50 +02:00
Edward Tjörnhammar
e697219d3d
openjdk8: work around gnupatch latest feature of not following symlinks, even when --follow-symlinks is specified.
2015-05-19 18:22:38 +02:00
Vladimír Čunát
3b9ef2c71b
fix "libc}/lib" and similar references
...
Done mostly without any verification.
I didn't bother with libc}/include, as the path is still correct.
2015-05-05 11:52:08 +02:00
Edward Tjörnhammar
ca9d049654
removing cocreature as maintainer, as per request #6305
2015-04-25 00:29:51 +02:00
Edward Tjörnhammar
ad03fb11b3
openjdk8: enable fontconfig, add fallback fonts and fix emacs highlighting
2015-04-25 00:22:57 +02:00
Cray Elliott
447f1dcffb
openjdk: patch build script to accept 4.x versioned linux kernels
2015-04-21 20:39:36 -07:00
Herwig Hochleitner
24ddfc7c38
passthru.home in openjdk8, similar to other jdks
2015-03-26 19:06:36 +01:00
Moritz Kiefer
4f3f301807
openjdk8: update to jdk8u40-b25
2015-03-05 18:04:21 +01:00
Shea Levy
a7dad535e4
Merge branch 'openjdk8' of git://github.com/cocreature/nixpkgs
...
Update to openjdk8u31b13
2015-02-05 14:22:12 -05:00
Shea Levy
c45372f038
Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'
...
Partial staging merge, including cc-wrapper fixes
Conflicts:
pkgs/applications/audio/spotify/default.nix
pkgs/build-support/cc-wrapper/default.nix
pkgs/development/compilers/cryptol/1.8.x.nix
2015-02-02 21:14:28 -05:00
Moritz Kiefer
f215189d1d
Make openjdk work with nonreparenting wms
2015-01-28 09:51:43 +01:00
Moritz Kiefer
7c40fe361a
Update to openjdk8u31b13
2015-01-28 09:00:48 +01:00
Moritz Kiefer
ea30130943
Fix openjdk8 build for i686
...
see http://mail.openjdk.java.net/pipermail/core-libs-dev/2013-July/019203.html
2015-01-28 08:59:40 +01:00
Moritz Kiefer
1af7967007
Add cocreature as maintainer of openjdk8
2015-01-20 19:07:54 +01:00
Moritz Kiefer
9b7e398a3c
Patch sh paths
2015-01-20 09:02:08 +01:00
Moritz Kiefer
46d59c3251
Add meta attribute to openjdk8
2015-01-20 09:02:07 +01:00
Moritz Kiefer
9d9f33863b
Add openjdk8
2015-01-20 09:02:07 +01:00
Eelco Dolstra
365ce3ddba
openjdk-bootstrap: Don't depend on the length of the Glibc version
...
Building the bootstrap OpenJDK failed if the Glibc version string is
not 4 characters, e.g. "2.12.1" would cause a corrupt tarball.
2015-01-19 23:24:47 +01:00
William A. Kennington III
bbc4262514
java: Add home passthru
2015-01-07 14:55:41 -08:00
Karn Kallio
9b81769950
openjdk : Patch to extend valid currency change dates to 20 years.
2014-12-30 16:42:42 +01:00
Rickard Nilsson
95fdc8cf29
openjdk: Introduce JAVAX_NET_SSL_TRUSTSTORE env
...
This small patch makes it possible to control java's truststore path through
the environment. This lets you add (system- or session-wide) CAs that should
be allowed by Java. Java users can still use -Djavax.net.ssl.truststore to
override the truststore set by JAVAX_NET_SSL_TRUSTSTORE.
Something like this can be used to build the truststore (in this example just
using the standard pkgs.cacert CA-bundle):
{
environment.variables.JAVAX_NET_SSL_TRUSTSTORE = "${
pkgs.runCommand "cacerts" {} ''
${pkgs.perl}/bin/perl \
${pkgs.path}/pkgs/development/compilers/openjdk/generate-cacerts.pl \
${pkgs.jre}/bin/keytool \
${pkgs.cacert}/etc/ca-bundle.crt
mv cacerts $out
''
}";
}
Ideally, the dependency on pkgs.cacert should also be removed from pkgs.openjdk
to avoid rebuilding java each time the standard CA-bundle changes. Something
along the example above must then be added to NixOS (however, it would be
nice to not depend on ${pkgs.jre}/bin/keytool to generate that environment
variable).
2014-12-12 01:14:09 +01:00
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