diff options
Diffstat (limited to 'pkgs/development/compilers/openjdk/default.nix')
-rw-r--r-- | pkgs/development/compilers/openjdk/default.nix | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index cf85c1706a8a..f243baab5919 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -21,6 +21,21 @@ , jreOnly ? false }: +let + + /** + * The JRE libraries are in directories that depend on the CPU. + */ + architecture = + if stdenv.system == "i686-linux" then + "i386" + else if stdenv.system == "x86_64-linux" then + "amd64" + else + throw "openjdk requires i686-linux or x86_64 linux"; + +in + stdenv.mkDerivation rec { name = "openj${if jreOnly then "re" else "dk"}-7b127"; @@ -107,6 +122,7 @@ stdenv.mkDerivation rec { "UNIXCOMMAND_PATH=" "BOOTDIR=${jdk}" "DROPS_DIR=$(DROPS_PATH)" + "SKIP_BOOT_CYCLE=false" ]; configurePhase = '' @@ -136,5 +152,7 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.linux; }; + + passthru = { inherit architecture; }; } |