From 821e3c294ff20c6a82e93f7c2d30c52386b625f8 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Fri, 6 Oct 2017 23:28:28 +0900
Subject: [PATCH] icu: make 58.2 coexists with 59.1

---
 pkgs/development/libraries/icu/58.nix              | 14 ++++++++++++++
 pkgs/development/libraries/icu/59.nix              |  4 ++++
 .../libraries/icu/{default.nix => base.nix}        |  6 ++++--
 pkgs/top-level/all-packages.nix                    |  6 +++++-
 4 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/libraries/icu/58.nix
 create mode 100644 pkgs/development/libraries/icu/59.nix
 rename pkgs/development/libraries/icu/{default.nix => base.nix} (93%)

diff --git a/pkgs/development/libraries/icu/58.nix b/pkgs/development/libraries/icu/58.nix
new file mode 100644
index 00000000000..e5b80f4b270
--- /dev/null
+++ b/pkgs/development/libraries/icu/58.nix
@@ -0,0 +1,14 @@
+args @ { stdenv, fetchurl, fetchpatch, fixDarwinDylibNames }:
+let
+  keywordFix = fetchurl {
+    url = "http://bugs.icu-project.org/trac/changeset/39484?format=diff";
+    name = "icu-changeset-39484.diff";
+    sha256 = "0hxhpgydalyxacaaxlmaddc1sjwh65rsnpmg0j414mnblq74vmm8";
+  };
+in
+import ./base.nix {
+  version = "58.2";
+  sha256 = "036shcb3f8bm1lynhlsb4kpjm9s9c2vdiir01vg216rs2l8482ib";
+  patches = [ keywordFix ];
+  patchFlags = "-p4";
+} args
diff --git a/pkgs/development/libraries/icu/59.nix b/pkgs/development/libraries/icu/59.nix
new file mode 100644
index 00000000000..9ca66ca525f
--- /dev/null
+++ b/pkgs/development/libraries/icu/59.nix
@@ -0,0 +1,4 @@
+import ./base.nix {
+  version = "59.1";
+  sha256 = "1zkmbg2932ggvpgjp8pys0cj6z8bw087y8858009shkrjfpzscki";
+}
diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/base.nix
similarity index 93%
rename from pkgs/development/libraries/icu/default.nix
rename to pkgs/development/libraries/icu/base.nix
index 5f81ae694cb..78e0c574044 100644
--- a/pkgs/development/libraries/icu/default.nix
+++ b/pkgs/development/libraries/icu/base.nix
@@ -1,8 +1,8 @@
+{ version, sha256, patches ? [], patchFlags ? "" }:
 { stdenv, fetchurl, fetchpatch, fixDarwinDylibNames }:
 
 let
   pname = "icu4c";
-  version = "59.1";
 in
 stdenv.mkDerivation {
   name = pname + "-" + version;
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   src = fetchurl {
     url = "http://download.icu-project.org/files/${pname}/${version}/${pname}-"
       + (stdenv.lib.replaceChars ["."] ["_"] version) + "-src.tgz";
-    sha256 = "1zkmbg2932ggvpgjp8pys0cj6z8bw087y8858009shkrjfpzscki";
+    inherit sha256;
   };
 
   outputs = [ "out" "dev" ];
@@ -25,6 +25,8 @@ stdenv.mkDerivation {
     echo Source root reset to ''${sourceRoot}
   '';
 
+  inherit patchFlags patches;
+
   preConfigure = ''
     sed -i -e "s|/bin/sh|${stdenv.shell}|" configure
   '' + stdenv.lib.optionalString stdenv.isArm ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5a50abf2721..c7128d7cc96 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8634,7 +8634,10 @@ with pkgs;
 
   hyena = callPackage ../development/libraries/hyena { };
 
-  icu = callPackage ../development/libraries/icu { };
+  icu58 = callPackage ../development/libraries/icu/58.nix { };
+  icu59 = callPackage ../development/libraries/icu/59.nix { };
+
+  icu = icu59;
 
   id3lib = callPackage ../development/libraries/id3lib { };
 
@@ -14544,6 +14547,7 @@ with pkgs;
       libpng = libpng_apng;
       python = python2;
       gnused = gnused_422;
+      icu = icu59;
     };
   });