alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

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

Browse source 
icu: fix regression on 32bit, missing parens :)
This commit is contained in:
Will Dietz 2018-02-28 10:24:30 -06:00 committed by GitHub
parent e7a573a85a 2d786a7697
commit b70e3f02ae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/top-level/all-packages.nix
View file

@ -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;