public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ICU: fix build with clang-5

Browse Source
This commit is contained in:
Daiderd Jordan 2018-02-01 00:26:49 +01:00
parent db7e0aeb42
commit 79f43537e6
No known key found for this signature in database
GPG Key ID: D02435D05B810C96
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/os-specific/darwin/apple-source-releases/ICU/clang-5.patch Normal file
View File

@ -0,0 +1,22 @@
diff --git a/icuSources/i18n/ucoleitr.cpp b/icuSources/i18n/ucoleitr.cpp
index ecc94c9..936452f 100644
--- a/icuSources/i18n/ucoleitr.cpp
+++ b/icuSources/i18n/ucoleitr.cpp
@@ -320,7 +320,7 @@ ucol_nextProcessed(UCollationElements *elems,
int32_t *ixHigh,
UErrorCode *status)
{
- return (UCollationPCE::UCollationPCE(elems)).nextProcessed(ixLow, ixHigh, status);
+ return (UCollationPCE(elems)).nextProcessed(ixLow, ixHigh, status);
}
@@ -384,7 +384,7 @@ ucol_previousProcessed(UCollationElements *elems,
int32_t *ixHigh,
UErrorCode *status)
{
- return (UCollationPCE::UCollationPCE(elems)).previousProcessed(ixLow, ixHigh, status);
+ return (UCollationPCE(elems)).previousProcessed(ixLow, ixHigh, status);
}
U_NAMESPACE_BEGIN

2
pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix
View File

@ -3,6 +3,8 @@
appleDerivation { appleDerivation {
nativeBuildInputs = [ cctools ]; nativeBuildInputs = [ cctools ];
patches = [ ./clang-5.patch ];
postPatch = '' postPatch = ''
substituteInPlace makefile \ substituteInPlace makefile \
--replace /usr/bin/ "" \ --replace /usr/bin/ "" \