diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2018-02-11 18:29:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-11 18:29:26 +0100 |
| commit | 69779a5f7e36644449b4d01e26ac4f6cd73c151a (patch) | |
| tree | ac833a9d35c9308a3605bab7a1b35d4734a94b24 /pkgs/os-specific/darwin | |
| parent | 06a7281d0f2c7866364d0a02b6178b3ed7c00b2f (diff) | |
| parent | 5af41b7a2265cbc88c3fa128133e91e274e937e0 (diff) | |
| download | nixlib-69779a5f7e36644449b4d01e26ac4f6cd73c151a.tar nixlib-69779a5f7e36644449b4d01e26ac4f6cd73c151a.tar.gz nixlib-69779a5f7e36644449b4d01e26ac4f6cd73c151a.tar.bz2 nixlib-69779a5f7e36644449b4d01e26ac4f6cd73c151a.tar.lz nixlib-69779a5f7e36644449b4d01e26ac4f6cd73c151a.tar.xz nixlib-69779a5f7e36644449b4d01e26ac4f6cd73c151a.tar.zst nixlib-69779a5f7e36644449b4d01e26ac4f6cd73c151a.zip | |
Merge pull request #33374 from dtzWill/update/llvm-5-default
Update LLVM default 4 -> 5
Diffstat (limited to 'pkgs/os-specific/darwin')
| -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 000000000000..fd9df8129407 --- /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 2d098418f030..eef26f4b79a6 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/ "" \ |