diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2018-02-01 00:26:49 +0100 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2018-02-06 23:38:46 +0100 |
| commit | 79f43537e6e99d6b9451d9643ae405aab29bb468 (patch) | |
| tree | b73b5f02c1065d34c82c0e7a7f415b6a658122c1 | |
| parent | db7e0aeb426534315888a38c1c13b6dd68ed014f (diff) | |
| download | nixpkgs-79f43537e6e99d6b9451d9643ae405aab29bb468.tar nixpkgs-79f43537e6e99d6b9451d9643ae405aab29bb468.tar.gz nixpkgs-79f43537e6e99d6b9451d9643ae405aab29bb468.tar.bz2 nixpkgs-79f43537e6e99d6b9451d9643ae405aab29bb468.tar.lz nixpkgs-79f43537e6e99d6b9451d9643ae405aab29bb468.tar.xz nixpkgs-79f43537e6e99d6b9451d9643ae405aab29bb468.tar.zst nixpkgs-79f43537e6e99d6b9451d9643ae405aab29bb468.zip | |
ICU: fix build with clang-5
| -rw-r--r-- | pkgs/os-specific/darwin/apple-source-releases/ICU/clang-5.patch | 22 | ||||
| -rw-r--r-- | pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix | 2 |
2 files changed, 24 insertions, 0 deletions
diff --git a/pkgs/os-specific/darwin/apple-source-releases/ICU/clang-5.patch b/pkgs/os-specific/darwin/apple-source-releases/ICU/clang-5.patch new file mode 100644 index 00000000000..fd9df812940 --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/ICU/clang-5.patch @@ -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 diff --git a/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix b/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix index 2d098418f03..eef26f4b79a 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix @@ -3,6 +3,8 @@ appleDerivation { nativeBuildInputs = [ cctools ]; + patches = [ ./clang-5.patch ]; + postPatch = '' substituteInPlace makefile \ --replace /usr/bin/ "" \ |