@@ -465,16 +465,18 @@ in
465465 perl = buildPackages.perl.override { fetchurl = stdenv.fetchurlBoot; };
466466 openssl = buildPackages.openssl.override {
467467 fetchurl = stdenv.fetchurlBoot;
468− coreutils = buildPackages.coreutils.override {
469− fetchurl = stdenv.fetchurlBoot;
468+ buildPackages = {
469+ coreutils = buildPackages.coreutils.override {
470+ fetchurl = stdenv.fetchurlBoot;
471+ inherit perl;
472+ xz = buildPackages.xz.override { fetchurl = stdenv.fetchurlBoot; };
473+ gmp = null;
474+ aclSupport = false;
475+ attrSupport = false;
476+ };
470477 inherit perl;
471− xz = buildPackages.xz.override { fetchurl = stdenv.fetchurlBoot; };
472− gmp = null;
473− aclSupport = false;
474− attrSupport = false;
475478 };
476479 inherit perl;
477− buildPackages = { inherit perl; };
478480 };
479481 libssh2 = buildPackages.libssh2.override {
480482 fetchurl = stdenv.fetchurlBoot;
@@ -16901,10 +16903,7 @@ in
1690116903
1690216904 wolfssl = callPackage ../development/libraries/wolfssl { };
1690316905
16904− openssl =
16905− if stdenv.hostPlatform.isMinGW # Work around broken cross build
16906− then openssl_1_0_2
16907− else openssl_1_1;
16906+ openssl = openssl_1_1;
1690816907
1690916908 inherit (callPackages ../development/libraries/openssl { })
1691016909 openssl_1_0_2