icu63: init at 63.1
This commit is contained in:
parent
9ca654825f
commit
70b8ab6e72
14
pkgs/development/libraries/icu/63.nix
Normal file
14
pkgs/development/libraries/icu/63.nix
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
{ stdenv, lib, fetchurl, fetchpatch, fixDarwinDylibNames, nativeBuildRoot }:
|
||||||
|
|
||||||
|
import ./base.nix {
|
||||||
|
version = "63.1";
|
||||||
|
sha256 = "17fbk0lm2clsxbmjzvyp245ayx0n4chji3ky1f3fbz2ljjv91i05";
|
||||||
|
patches = [
|
||||||
|
# https://bugzilla.mozilla.org/show_bug.cgi?id=1499398
|
||||||
|
(fetchpatch {
|
||||||
|
url = https://github.com/unicode-org/icu/commit/8baff8f03e07d8e02304d0c888d0bb21ad2eeb01.patch;
|
||||||
|
sha256 = "1awfa98ljcf95a85cssahw6bvdnpbq5brf1kgspy14w4mlmhd0jb";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
patchFlags = [ "-p3" ];
|
||||||
|
} { inherit stdenv lib fetchurl fixDarwinDylibNames nativeBuildRoot; }
|
@ -1,5 +1,5 @@
|
|||||||
{ version, sha256, patches ? [], patchFlags ? "" }:
|
{ version, sha256, patches ? [], patchFlags ? "" }:
|
||||||
{ stdenv, fetchurl, fixDarwinDylibNames
|
{ stdenv, lib, fetchurl, fixDarwinDylibNames
|
||||||
# Cross-compiled icu4c requires a build-root of a native compile
|
# Cross-compiled icu4c requires a build-root of a native compile
|
||||||
, buildRootOnly ? false, nativeBuildRoot
|
, buildRootOnly ? false, nativeBuildRoot
|
||||||
}:
|
}:
|
||||||
@ -20,7 +20,7 @@ let
|
|||||||
'';
|
'';
|
||||||
|
|
||||||
# https://sourceware.org/glibc/wiki/Release/2.26#Removal_of_.27xlocale.h.27
|
# https://sourceware.org/glibc/wiki/Release/2.26#Removal_of_.27xlocale.h.27
|
||||||
postPatch = if (stdenv.hostPlatform.libc == "glibc" || stdenv.hostPlatform.libc == "musl")
|
postPatch = if (stdenv.hostPlatform.libc == "glibc" || stdenv.hostPlatform.libc == "musl") && lib.versionOlder version "62.1"
|
||||||
then "substituteInPlace i18n/digitlst.cpp --replace '<xlocale.h>' '<locale.h>'"
|
then "substituteInPlace i18n/digitlst.cpp --replace '<xlocale.h>' '<locale.h>'"
|
||||||
else null; # won't find locale_t on darwin
|
else null; # won't find locale_t on darwin
|
||||||
|
|
||||||
|
@ -10321,6 +10321,11 @@ in
|
|||||||
} // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
|
} // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
|
||||||
stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4'
|
stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4'
|
||||||
}));
|
}));
|
||||||
|
icu63 = callPackage ../development/libraries/icu/63.nix ({
|
||||||
|
nativeBuildRoot = buildPackages.icu63.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;
|
icu = icu59;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user