diff options
| author | John Doe <John Doe john@example.com> | 2017-12-06 07:38:45 +0000 |
|---|---|---|
| committer | John Doe <John Doe john@example.com> | 2017-12-06 07:43:22 +0000 |
| commit | 683337d5f579bba7042d065741112753fc9a1967 (patch) | |
| tree | 4819b6b98db3dbef978defba99a709ffdccd4105 /pkgs/top-level | |
| parent | 018a3ec5272cfa12dc35bcd39160d6e9c0718d7f (diff) | |
| download | nixlib-683337d5f579bba7042d065741112753fc9a1967.tar nixlib-683337d5f579bba7042d065741112753fc9a1967.tar.gz nixlib-683337d5f579bba7042d065741112753fc9a1967.tar.bz2 nixlib-683337d5f579bba7042d065741112753fc9a1967.tar.lz nixlib-683337d5f579bba7042d065741112753fc9a1967.tar.xz nixlib-683337d5f579bba7042d065741112753fc9a1967.tar.zst nixlib-683337d5f579bba7042d065741112753fc9a1967.zip | |
oraclejdk: remove redundant asserts
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cbd8327121ff..3f1f98e25162 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6060,26 +6060,17 @@ with pkgs; jre8Plugin = lowPrio (pkgs.oraclejdk8distro false true); - supportsJDK = - system == "i686-linux" || - system == "x86_64-linux" || - system == "armv7l-linux" || - system == "aarch64-linux"; - jdkdistro = oraclejdk8distro; oraclejdk8distro = installjdk: pluginSupport: - assert supportsJDK; (if pluginSupport then appendToName "with-plugin" else x: x) (callPackage ../development/compilers/oraclejdk/jdk8cpu-linux.nix { inherit installjdk pluginSupport; }); oraclejdk8psu_distro = installjdk: pluginSupport: - assert supportsJDK; (if pluginSupport then appendToName "with-plugin" else x: x) (callPackage ../development/compilers/oraclejdk/jdk8psu-linux.nix { inherit installjdk pluginSupport; }); oraclejdk9distro = packageType: pluginSupport: - assert supportsJDK; (if pluginSupport then appendToName "with-plugin" else x: x) (callPackage ../development/compilers/oraclejdk/jdk9-linux.nix { inherit packageType pluginSupport; }); |