tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
ICU: fix build with clang-5
Daiderd Jordan
8 years ago
79f43537
db7e0aeb
+24
2 changed files
expand all
collapse all
unified
split
pkgs
os-specific
darwin
apple-source-releases
ICU
clang-5.patch
default.nix
+22
pkgs/os-specific/darwin/apple-source-releases/ICU/clang-5.patch
···
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
···
1
+
diff --git a/icuSources/i18n/ucoleitr.cpp b/icuSources/i18n/ucoleitr.cpp
2
+
index ecc94c9..936452f 100644
3
+
--- a/icuSources/i18n/ucoleitr.cpp
4
+
+++ b/icuSources/i18n/ucoleitr.cpp
5
+
@@ -320,7 +320,7 @@ ucol_nextProcessed(UCollationElements *elems,
6
+
int32_t *ixHigh,
7
+
UErrorCode *status)
8
+
{
9
+
- return (UCollationPCE::UCollationPCE(elems)).nextProcessed(ixLow, ixHigh, status);
10
+
+ return (UCollationPCE(elems)).nextProcessed(ixLow, ixHigh, status);
11
+
}
12
+
13
+
14
+
@@ -384,7 +384,7 @@ ucol_previousProcessed(UCollationElements *elems,
15
+
int32_t *ixHigh,
16
+
UErrorCode *status)
17
+
{
18
+
- return (UCollationPCE::UCollationPCE(elems)).previousProcessed(ixLow, ixHigh, status);
19
+
+ return (UCollationPCE(elems)).previousProcessed(ixLow, ixHigh, status);
20
+
}
21
+
22
+
U_NAMESPACE_BEGIN
+2
pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix
···
3
appleDerivation {
4
nativeBuildInputs = [ cctools ];
5
0
0
6
postPatch = ''
7
substituteInPlace makefile \
8
--replace /usr/bin/ "" \
···
3
appleDerivation {
4
nativeBuildInputs = [ cctools ];
5
6
+
patches = [ ./clang-5.patch ];
7
+
8
postPatch = ''
9
substituteInPlace makefile \
10
--replace /usr/bin/ "" \