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

Shea Levy a08ca4c0 3ab23d95

+15 -11
-1
pkgs/development/compilers/openjdk/default.nix
··· 122 122 "UNIXCOMMAND_PATH=" 123 123 "BOOTDIR=${jdk}" 124 124 "DROPS_DIR=$(DROPS_PATH)" 125 - "SKIP_BOOT_CYCLE=false" 126 125 ]; 127 126 128 127 configurePhase = ''
+15 -10
pkgs/top-level/all-packages.nix
··· 2355 2355 2356 2356 openjdkBootstrap = callPackage ../development/compilers/openjdk/bootstrap.nix {}; 2357 2357 2358 + openjdkStage1 = callPackage ../development/compilers/openjdk { 2359 + jdk = pkgs.openjdkBootstrap; 2360 + ant = pkgs.ant.override { jdk = pkgs.openjdkBootstrap; }; 2361 + }; 2362 + 2358 2363 openjdk = 2359 2364 if stdenv.isDarwin then 2360 2365 callPackage ../development/compilers/openjdk-darwin { } 2361 2366 else 2362 2367 callPackage ../development/compilers/openjdk { 2363 - jdk = pkgs.openjdkBootstrap; 2364 - ant = pkgs.ant.override { jdk = pkgs.openjdkBootstrap; }; 2368 + jdk = pkgs.openjdkStage1; 2369 + ant = pkgs.ant.override { jdk = pkgs.openjdkStage1; }; 2365 2370 }; 2366 2371 2367 - openjre = callPackage ../development/compilers/openjdk { 2372 + openjre = pkgs.openjdk.override { 2368 2373 jreOnly = true; 2369 2374 }; 2370 2375 2371 2376 jdk = if (stdenv.isDarwin || stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") 2372 - then openjdk 2373 - else jdkdistro true false; 2377 + then pkgs.openjdk 2378 + else pkgs.oraclejdk; 2374 2379 jre = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") 2375 - then openjre 2376 - else jdkdistro false false; 2380 + then pkgs.openjre 2381 + else pkgs.oraclejre; 2377 2382 2378 - oraclejdk = jdkdistro true false; 2383 + oraclejdk = pkgs.jdkdistro true false; 2379 2384 2380 - oraclejre = jdkdistro false false; 2385 + oraclejre = pkgs.jdkdistro false false; 2381 2386 2382 - jrePlugin = lowPrio (jdkdistro false true); 2387 + jrePlugin = lowPrio (pkgs.jdkdistro false true); 2383 2388 2384 2389 supportsJDK = 2385 2390 system == "i686-linux" ||