diff options
| author | taku0 <mxxouy6x3m_github@tatapa.org> | 2017-10-06 23:28:28 +0900 |
|---|---|---|
| committer | taku0 <mxxouy6x3m_github@tatapa.org> | 2017-10-06 23:28:28 +0900 |
| commit | 821e3c294ff20c6a82e93f7c2d30c52386b625f8 (patch) | |
| tree | 6eff68f202852db93f4e1da082d25a50659bd29c /pkgs/development/libraries/icu | |
| parent | ddfcc15bb8a68548c807fbfe7eb80618311d446d (diff) | |
| download | nixpkgs-821e3c294ff20c6a82e93f7c2d30c52386b625f8.tar nixpkgs-821e3c294ff20c6a82e93f7c2d30c52386b625f8.tar.gz nixpkgs-821e3c294ff20c6a82e93f7c2d30c52386b625f8.tar.bz2 nixpkgs-821e3c294ff20c6a82e93f7c2d30c52386b625f8.tar.lz nixpkgs-821e3c294ff20c6a82e93f7c2d30c52386b625f8.tar.xz nixpkgs-821e3c294ff20c6a82e93f7c2d30c52386b625f8.tar.zst nixpkgs-821e3c294ff20c6a82e93f7c2d30c52386b625f8.zip | |
icu: make 58.2 coexists with 59.1
Diffstat (limited to 'pkgs/development/libraries/icu')
| -rw-r--r-- | pkgs/development/libraries/icu/58.nix | 14 | ||||
| -rw-r--r-- | pkgs/development/libraries/icu/59.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/icu/base.nix (renamed from pkgs/development/libraries/icu/default.nix) | 6 |
3 files changed, 22 insertions, 2 deletions
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 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 '' |