summary refs log tree commit diff
diff options
context:
space:
mode:
authorWill Dietz <github@wdtz.org>2018-02-28 10:24:30 -0600
committerGitHub <noreply@github.com>2018-02-28 10:24:30 -0600
commitb70e3f02ae76cf6ef2f51405ca6c22abcf7a7246 (patch)
treee09106d2872733dbf077094b6eff17e338e4c149
parente7a573a85a92034b42817cef3ad79660697a58b4 (diff)
parent2d786a7697fa75e31c9b6e1203212fc531217612 (diff)
downloadnixlib-b70e3f02ae76cf6ef2f51405ca6c22abcf7a7246.tar
nixlib-b70e3f02ae76cf6ef2f51405ca6c22abcf7a7246.tar.gz
nixlib-b70e3f02ae76cf6ef2f51405ca6c22abcf7a7246.tar.bz2
nixlib-b70e3f02ae76cf6ef2f51405ca6c22abcf7a7246.tar.lz
nixlib-b70e3f02ae76cf6ef2f51405ca6c22abcf7a7246.tar.xz
nixlib-b70e3f02ae76cf6ef2f51405ca6c22abcf7a7246.tar.zst
nixlib-b70e3f02ae76cf6ef2f51405ca6c22abcf7a7246.zip
Merge pull request #36130 from dtzWill/fix/icu-gcc6
icu: fix regression on 32bit, missing parens :)
-rw-r--r--pkgs/top-level/all-packages.nix12
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 359227f25f50..6c58f98380a6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9241,22 +9241,22 @@ with pkgs;
 
   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;