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