diff options
| author | Shea Levy <shea@shealevy.com> | 2012-08-27 12:41:13 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2012-08-27 12:41:13 -0400 |
| commit | f4bc57febac5150a385165c6a9df054482f669ba (patch) | |
| tree | 4cdbf7af9a32c257f56f2c9cd3d8dace90cd7274 /pkgs | |
| parent | dc4cfe89ff69cd243ef2d8e83e78c3b0a297317b (diff) | |
| download | nixlib-f4bc57febac5150a385165c6a9df054482f669ba.tar nixlib-f4bc57febac5150a385165c6a9df054482f669ba.tar.gz nixlib-f4bc57febac5150a385165c6a9df054482f669ba.tar.bz2 nixlib-f4bc57febac5150a385165c6a9df054482f669ba.tar.lz nixlib-f4bc57febac5150a385165c6a9df054482f669ba.tar.xz nixlib-f4bc57febac5150a385165c6a9df054482f669ba.tar.zst nixlib-f4bc57febac5150a385165c6a9df054482f669ba.zip | |
openjdk: passthru the architecture attribute like oracle jdk6 does.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/compilers/openjdk/default.nix | 17 | ||||
| -rw-r--r-- | pkgs/development/compilers/openjdk/make-bootstrap.nix | 2 |
2 files changed, 18 insertions, 1 deletions
diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index 5f5148911ec2..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"; @@ -137,5 +152,7 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.linux; }; + + passthru = { inherit architecture; }; } diff --git a/pkgs/development/compilers/openjdk/make-bootstrap.nix b/pkgs/development/compilers/openjdk/make-bootstrap.nix index aa5b8ad39f56..090a1479741a 100644 --- a/pkgs/development/compilers/openjdk/make-bootstrap.nix +++ b/pkgs/development/compilers/openjdk/make-bootstrap.nix @@ -1,6 +1,6 @@ { runCommand, openjdk, nukeReferences }: -let arch = if openjdk.system == "x86_64-linux" then "amd64" else "i386"; in +let arch = openjdk.architecture; in runCommand "${openjdk.name}-bootstrap.tar.xz" {} '' mkdir -p openjdk-bootstrap/bin |