Merge pull request #36130 from dtzWill/fix/icu-gcc6

icu: fix regression on 32bit, missing parens :)

Changed files
+6 -6
pkgs
top-level
+6 -6
pkgs/top-level/all-packages.nix
···
hyena = callPackage ../development/libraries/hyena { };
-
icu58 = callPackage (import ../development/libraries/icu/58.nix fetchurl) {
+
icu58 = callPackage (import ../development/libraries/icu/58.nix fetchurl) ({
nativeBuildRoot = buildPackages.icu58.override { buildRootOnly = true; };
} //
(stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4'
-
});
-
icu59 = callPackage ../development/libraries/icu/59.nix {
+
}));
+
icu59 = callPackage ../development/libraries/icu/59.nix ({
nativeBuildRoot = buildPackages.icu59.override { buildRootOnly = true; };
} // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4'
-
});
-
icu60 = callPackage ../development/libraries/icu/60.nix {
+
}));
+
icu60 = callPackage ../development/libraries/icu/60.nix ({
nativeBuildRoot = buildPackages.icu60.override { buildRootOnly = true; };
} // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4'
-
});
+
}));
icu = icu59;