diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-08-20 15:11:29 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-08-30 17:20:32 -0400 |
commit | 2c2f1e37d4374ea61caefd9389927ea03df4ce31 (patch) | |
tree | 1c0dff3f6483825a9143741bdddca44f35bb4224 /pkgs/development/compilers/oraclejdk | |
parent | 94f71d800db2ef7afb9fc8dad9e9aa503bfa2941 (diff) | |
download | nixlib-2c2f1e37d4374ea61caefd9389927ea03df4ce31.tar nixlib-2c2f1e37d4374ea61caefd9389927ea03df4ce31.tar.gz nixlib-2c2f1e37d4374ea61caefd9389927ea03df4ce31.tar.bz2 nixlib-2c2f1e37d4374ea61caefd9389927ea03df4ce31.tar.lz nixlib-2c2f1e37d4374ea61caefd9389927ea03df4ce31.tar.xz nixlib-2c2f1e37d4374ea61caefd9389927ea03df4ce31.tar.zst nixlib-2c2f1e37d4374ea61caefd9389927ea03df4ce31.zip |
reewide: Purge all uses `stdenv.system` and top-level `system`
It is deprecated and will be removed after 18.09.
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 ] |