Merge pull request #107774 from marsam/update-icu

icu: 67.1 -> 68.2
This commit is contained in:
Mario Rodas 2021-02-13 15:08:27 -05:00 committed by GitHub
commit b24c0ac54f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 1 deletions

View File

@ -0,0 +1,4 @@
import ./base.nix {
version = "68.2";
sha256 = "09fng7a80xj8d5r1cgbgq8r47dsw5jsr6si9p2cj2ylhwgg974f7";
}

View File

@ -14338,8 +14338,13 @@ in
} // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) {
stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4'
}));
icu68 = callPackage ../development/libraries/icu/68.nix ({
nativeBuildRoot = buildPackages.icu68.override { buildRootOnly = true; };
} // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) {
stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4'
}));
icu = icu67;
icu = icu68;
id3lib = callPackage ../development/libraries/id3lib { };