diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-02-20 17:44:40 -0500 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-02-26 21:17:32 -0500 |
commit | 933e8663ad7b2adc41c158fd2c765eef2334baca (patch) | |
tree | 786b29b7dd2b4a8b099018099a5b1c2e661b5ddc /pkgs/development/compilers/openjdk/8.nix | |
parent | 30f171d3e28ba8c331a8eae941c86465b544746a (diff) | |
download | nixlib-933e8663ad7b2adc41c158fd2c765eef2334baca.tar nixlib-933e8663ad7b2adc41c158fd2c765eef2334baca.tar.gz nixlib-933e8663ad7b2adc41c158fd2c765eef2334baca.tar.bz2 nixlib-933e8663ad7b2adc41c158fd2c765eef2334baca.tar.lz nixlib-933e8663ad7b2adc41c158fd2c765eef2334baca.tar.xz nixlib-933e8663ad7b2adc41c158fd2c765eef2334baca.tar.zst nixlib-933e8663ad7b2adc41c158fd2c765eef2334baca.zip |
openjdk: Clean up platform conditionals
Diffstat (limited to 'pkgs/development/compilers/openjdk/8.nix')
-rw-r--r-- | pkgs/development/compilers/openjdk/8.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index b74c8a47dde0..24cf1b8a0c93 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -14,9 +14,9 @@ let * The JRE libraries are in directories that depend on the CPU. */ architecture = - if stdenv.system == "i686-linux" then + if stdenv.hostPlatform.system == "i686-linux" then "i386" - else if stdenv.system == "x86_64-linux" then + else if stdenv.hostPlatform.system == "x86_64-linux" then "amd64" else throw "openjdk requires i686-linux or x86_64 linux"; |