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
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
Shea Levy
f70d3b72df
openjdk: We need ECHO to be echo -e, so replace the override with a sed
...
svn path=/nixpkgs/trunk/; revision=28084
2011-08-01 01:15:37 +00:00
Shea Levy
5fca670490
openjdk: Use makeFlags properly
...
svn path=/nixpkgs/trunk/; revision=28083
2011-08-01 01:15:29 +00:00
Shea Levy
58d64db27d
openjdk: Override hardcoded sort. It doesn't use any of the _PATH variables on linux
...
svn path=/nixpkgs/trunk/; revision=28082
2011-08-01 01:15:21 +00:00
Shea Levy
465a320b20
openjdk: Remove unneeded explicit dependencies
...
svn path=/nixpkgs/trunk/; revision=28081
2011-08-01 01:15:13 +00:00
Shea Levy
d0fe9fa2e8
openjdk: Remove all hardcoded binary overrides except echo
...
svn path=/nixpkgs/trunk/; revision=28080
2011-08-01 01:15:05 +00:00
Shea Levy
a0022251d9
openjdk: Override hardcoded echo again. It doesn't use any of the _PATH variables on linux
...
svn path=/nixpkgs/trunk/; revision=28079
2011-08-01 01:14:57 +00:00
Shea Levy
cdc12ac64a
openjdk: Add nettools to buildInputs
...
svn path=/nixpkgs/trunk/; revision=28078
2011-08-01 01:14:49 +00:00
Shea Levy
29c72c4499
openjdk: Override UNIXCOMMAND_PATH so those binaries are found in /home/play/bin:/var/setuid-wrappers:/home/play/.nix-profile/bin:/home/play/.nix-profile/sbin:/home/play/.nix-profile/lib/kde4/libexec:/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/nix/var/nix/profiles/default/lib/kde4/libexec:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin:/var/run/current-system/sw/lib/kde4/libexec
...
svn path=/nixpkgs/trunk/; revision=28077
2011-08-01 01:14:41 +00:00
Shea Levy
0f257e1d5d
openjdk: Remove all coreutils overrides so they can be found in /home/play/bin:/var/setuid-wrappers:/home/play/.nix-profile/bin:/home/play/.nix-profile/sbin:/home/play/.nix-profile/lib/kde4/libexec:/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/nix/var/nix/profiles/default/lib/kde4/libexec:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin:/var/run/current-system/sw/lib/kde4/libexec
...
svn path=/nixpkgs/trunk/; revision=28076
2011-08-01 01:14:33 +00:00
Shea Levy
693dc6536b
openjdk: Replace dummy paths with empty path so the build uses the binaries in /home/play/bin:/var/setuid-wrappers:/home/play/.nix-profile/bin:/home/play/.nix-profile/sbin:/home/play/.nix-profile/lib/kde4/libexec:/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/nix/var/nix/profiles/default/lib/kde4/libexec:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin:/var/run/current-system/sw/lib/kde4/libexec
...
svn path=/nixpkgs/trunk/; revision=28075
2011-08-01 01:14:25 +00:00
Shea Levy
49be6e4ed6
openjdk: Override hardcode to ln
...
svn path=/nixpkgs/trunk/; revision=28074
2011-08-01 01:14:17 +00:00
Shea Levy
b65c19f18b
openjdk: Override hardcode to readelf
...
svn path=/nixpkgs/trunk/; revision=28073
2011-08-01 01:14:09 +00:00
Shea Levy
8cf5de2fd4
openjdk: Override hardcodes to nm and ldd
...
svn path=/nixpkgs/trunk/; revision=28072
2011-08-01 01:14:00 +00:00
Shea Levy
dff2d2b06f
openjdk: Override hardcode to mv
...
svn path=/nixpkgs/trunk/; revision=28071
2011-08-01 01:13:52 +00:00
Shea Levy
1eb55ce743
openjdk: Fix hardcode to /bin/ls
...
svn path=/nixpkgs/trunk/; revision=28070
2011-08-01 01:13:44 +00:00
Shea Levy
ddd7cc3fd2
openjdk: Fix hardcode to /usr/bin/test
...
svn path=/nixpkgs/trunk/; revision=28069
2011-08-01 01:13:36 +00:00
Shea Levy
0603a5d356
openjdk: Allow downloads of source 'drops' during build
...
svn path=/nixpkgs/trunk/; revision=28068
2011-08-01 01:13:27 +00:00
Shea Levy
482daa3afd
openjdk: Add zip to buildInputs
...
svn path=/nixpkgs/trunk/; revision=28067
2011-08-01 01:13:19 +00:00
Shea Levy
2731048017
openjdk: Override hardcoded chmod
...
svn path=/nixpkgs/trunk/; revision=28066
2011-08-01 01:13:11 +00:00
Shea Levy
b722db6adb
openjdk: Override hardcoded cp
...
svn path=/nixpkgs/trunk/; revision=28065
2011-08-01 01:13:02 +00:00
Shea Levy
735366584a
openjdk: Override hardcoded touch
...
svn path=/nixpkgs/trunk/; revision=28064
2011-08-01 01:12:54 +00:00
Shea Levy
5054c8e8bb
openjdk: Override hardcoded find
...
svn path=/nixpkgs/trunk/; revision=28063
2011-08-01 01:12:44 +00:00
Shea Levy
40d1bd9950
openjdk: Replace substitutions with env vars
...
svn path=/nixpkgs/trunk/; revision=28062
2011-08-01 01:12:36 +00:00
Shea Levy
b1b5b09557
openjdk: Add bootstrap JDK
...
svn path=/nixpkgs/trunk/; revision=28061
2011-08-01 01:12:28 +00:00
Shea Levy
75918e6537
openjdk: add 'which' to buildInputs
...
svn path=/nixpkgs/trunk/; revision=28060
2011-08-01 01:12:19 +00:00
Shea Levy
82d11e742c
openjdk: Override hardcoded printf
...
svn path=/nixpkgs/trunk/; revision=28059
2011-08-01 01:12:12 +00:00
Shea Levy
706a7ff59d
openjdk: Override hardcoded gawk
...
svn path=/nixpkgs/trunk/; revision=28058
2011-08-01 01:12:04 +00:00
Shea Levy
374eb5688e
openjdk: Set dummy /home/play/bin:/var/setuid-wrappers:/home/play/.nix-profile/bin:/home/play/.nix-profile/sbin:/home/play/.nix-profile/lib/kde4/libexec:/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/nix/var/nix/profiles/default/lib/kde4/libexec:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin:/var/run/current-system/sw/lib/kde4/libexec variables
...
svn path=/nixpkgs/trunk/; revision=28057
2011-08-01 01:11:56 +00:00
Shea Levy
a156ccd763
openjdk: Fix ALSA_INCLUDE variable
...
svn path=/nixpkgs/trunk/; revision=28056
2011-08-01 01:11:48 +00:00
Shea Levy
ac6fb72ab1
openjdk: Override hardcoded cups headers path
...
svn path=/nixpkgs/trunk/; revision=28055
2011-08-01 01:11:40 +00:00
Shea Levy
fa80adbe2a
openjdk: Use proper milestone and build_number strings
...
svn path=/nixpkgs/trunk/; revision=28054
2011-08-01 01:11:32 +00:00
Shea Levy
08fe49fbb4
openjdk: Override hardcoded cat
...
svn path=/nixpkgs/trunk/; revision=28053
2011-08-01 01:11:24 +00:00
Shea Levy
ed9837c37c
openjdk: Override hardcoded freetype library path
...
svn path=/nixpkgs/trunk/; revision=28052
2011-08-01 01:11:17 +00:00
Shea Levy
d5eec4cd11
openjdk: Override hardcoded freetype headers
...
svn path=/nixpkgs/trunk/; revision=28051
2011-08-01 01:11:09 +00:00
Shea Levy
38c1179f56
openjdk: Override hardcoded zip
...
svn path=/nixpkgs/trunk/; revision=28046
2011-08-01 01:10:28 +00:00
Shea Levy
6795da6837
Rearrange program inputs
...
svn path=/nixpkgs/trunk/; revision=28045
2011-08-01 01:10:16 +00:00
Shea Levy
52582a9b45
openjdk: Add ant to buildInputs
...
svn path=/nixpkgs/trunk/; revision=28044
2011-08-01 01:10:08 +00:00
Shea Levy
17c2fb730e
openjdk: Override hardcoded head
...
svn path=/nixpkgs/trunk/; revision=28043
2011-08-01 01:10:01 +00:00
Shea Levy
27112e7233
openjdk: Override hardcoded alsa headers
...
svn path=/nixpkgs/trunk/; revision=28042
2011-08-01 01:09:53 +00:00
Shea Levy
e3ebf2024a
openjdk: Fix hardcoded sed
...
svn path=/nixpkgs/trunk/; revision=28041
2011-08-01 01:09:45 +00:00
Shea Levy
0734d0315e
openjdk: Override hardcoded egrep
...
svn path=/nixpkgs/trunk/; revision=28040
2011-08-01 01:09:38 +00:00
Shea Levy
8286d4df8d
openjdk: Override hardcoded tr
...
svn path=/nixpkgs/trunk/; revision=28039
2011-08-01 01:09:30 +00:00
Shea Levy
027595d6b0
openjdk: Override hardcoded pwd
...
svn path=/nixpkgs/trunk/; revision=28038
2011-08-01 01:09:22 +00:00
Shea Levy
39bea03827
openjdk: Override hardcoded date
...
svn path=/nixpkgs/trunk/; revision=28037
2011-08-01 01:09:14 +00:00
Shea Levy
eceec04a44
openjdk: Override hardcoded grep
...
svn path=/nixpkgs/trunk/; revision=28036
2011-08-01 01:09:06 +00:00
Shea Levy
b3ab977d90
openjdk: Factor path overrides out into makeFlags
...
svn path=/nixpkgs/trunk/; revision=28035
2011-08-01 01:08:58 +00:00
Shea Levy
146d6875b3
openjdk: Fix hardcoded gcc
...
svn path=/nixpkgs/trunk/; revision=28034
2011-08-01 01:08:49 +00:00
Shea Levy
057e36e2f7
openjdk: Override hard-coded mkdir
...
svn path=/nixpkgs/trunk/; revision=28033
2011-08-01 01:08:40 +00:00
Shea Levy
3439ac32bf
openjdk: Fix some formatting
...
svn path=/nixpkgs/trunk/; revision=28032
2011-08-01 01:08:32 +00:00
Shea Levy
d46390e7d2
openjdk: Add sanity check
...
svn path=/nixpkgs/trunk/; revision=28031
2011-08-01 01:08:23 +00:00
Shea Levy
686476b7bb
openjdk: Fix hard-code to echo
...
svn path=/nixpkgs/trunk/; revision=28030
2011-08-01 01:08:15 +00:00
Shea Levy
11f0ca9320
openjdk: Add 'free' to $PATH for the build
...
svn path=/nixpkgs/trunk/; revision=28029
2011-08-01 01:08:07 +00:00
Shea Levy
23e378a3c4
*openjdk: Get source to unpack
...
svn path=/nixpkgs/trunk/; revision=28028
2011-08-01 01:07:58 +00:00
Shea Levy
2c17fb436b
Copy openjdk-darwin as a starting point for openjdk7
...
svn path=/nixpkgs/trunk/; revision=27992
2011-07-28 18:53:12 +00:00