diff options
| author | John Ericson <mail@JohnEricson.me> | 2018-08-31 09:56:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-31 09:56:10 -0400 |
| commit | 2c4a75e9ef9721d2c1a96701a6271f94ee0bdc93 (patch) | |
| tree | 46c1a6242a2243d6d6bd04d0dcb234056bc01c14 /pkgs/development/compilers/oraclejdk | |
| parent | f7606a82ed6bbf93c015c01b4067c7529ab3e74e (diff) | |
| parent | 0828e2d8c369604c56219bd7085256b984087280 (diff) | |
| download | nixlib-2c4a75e9ef9721d2c1a96701a6271f94ee0bdc93.tar nixlib-2c4a75e9ef9721d2c1a96701a6271f94ee0bdc93.tar.gz nixlib-2c4a75e9ef9721d2c1a96701a6271f94ee0bdc93.tar.bz2 nixlib-2c4a75e9ef9721d2c1a96701a6271f94ee0bdc93.tar.lz nixlib-2c4a75e9ef9721d2c1a96701a6271f94ee0bdc93.tar.xz nixlib-2c4a75e9ef9721d2c1a96701a6271f94ee0bdc93.tar.zst nixlib-2c4a75e9ef9721d2c1a96701a6271f94ee0bdc93.zip | |
Merge pull request #45820 from obsidiansystems/dont-use-obsolete-platform-aliases
treewide: Dont use obsolete platform aliases
Diffstat (limited to 'pkgs/development/compilers/oraclejdk')
| -rw-r--r-- | pkgs/development/compilers/oraclejdk/jdk-linux-base.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index baa136b798d9..5d55e0554e55 100644 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -46,7 +46,7 @@ let x86_64-linux = "amd64"; armv7l-linux = "arm"; aarch64-linux = "aarch64"; - }.${stdenv.system}; + }.${stdenv.hostPlatform.system}; jce = if installjce then @@ -77,9 +77,9 @@ let result = stdenv.mkDerivation rec { x86_64-linux = "jdk-${productVersion}u${patchVersion}-linux-x64.tar.gz"; armv7l-linux = "jdk-${productVersion}u${patchVersion}-linux-arm32-vfp-hflt.tar.gz"; aarch64-linux = "jdk-${productVersion}u${patchVersion}-linux-arm64-vfp-hflt.tar.gz"; - }.${stdenv.system}; + }.${stdenv.hostPlatform.system}; url = downloadUrl; - sha256 = sha256.${stdenv.system}; + sha256 = sha256.${stdenv.hostPlatform.system}; }; nativeBuildInputs = [ file ] |