diff options
| author | Alyssa Ross <hi@alyssa.is> | 2018-12-17 00:59:22 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2018-12-17 15:14:45 +0000 |
| commit | 70b8ab6e7265561afa0f80a2f3cfb9c079579f2a (patch) | |
| tree | 97c70b8f1b179a1c7cb93fc9b6b8c7563651807f | |
| parent | 9ca654825f5dcfc73db707c8cf2392c780fca068 (diff) | |
| download | nixpkgs-70b8ab6e7265561afa0f80a2f3cfb9c079579f2a.tar nixpkgs-70b8ab6e7265561afa0f80a2f3cfb9c079579f2a.tar.gz nixpkgs-70b8ab6e7265561afa0f80a2f3cfb9c079579f2a.tar.bz2 nixpkgs-70b8ab6e7265561afa0f80a2f3cfb9c079579f2a.tar.lz nixpkgs-70b8ab6e7265561afa0f80a2f3cfb9c079579f2a.tar.xz nixpkgs-70b8ab6e7265561afa0f80a2f3cfb9c079579f2a.tar.zst nixpkgs-70b8ab6e7265561afa0f80a2f3cfb9c079579f2a.zip | |
icu63: init at 63.1
| -rw-r--r-- | pkgs/development/libraries/icu/63.nix | 14 | ||||
| -rw-r--r-- | pkgs/development/libraries/icu/base.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
3 files changed, 21 insertions, 2 deletions
diff --git a/pkgs/development/libraries/icu/63.nix b/pkgs/development/libraries/icu/63.nix new file mode 100644 index 00000000000..719318990c6 --- /dev/null +++ b/pkgs/development/libraries/icu/63.nix @@ -0,0 +1,14 @@ +{ stdenv, lib, fetchurl, fetchpatch, fixDarwinDylibNames, nativeBuildRoot }: + +import ./base.nix { + version = "63.1"; + sha256 = "17fbk0lm2clsxbmjzvyp245ayx0n4chji3ky1f3fbz2ljjv91i05"; + patches = [ + # https://bugzilla.mozilla.org/show_bug.cgi?id=1499398 + (fetchpatch { + url = https://github.com/unicode-org/icu/commit/8baff8f03e07d8e02304d0c888d0bb21ad2eeb01.patch; + sha256 = "1awfa98ljcf95a85cssahw6bvdnpbq5brf1kgspy14w4mlmhd0jb"; + }) + ]; + patchFlags = [ "-p3" ]; +} { inherit stdenv lib fetchurl fixDarwinDylibNames nativeBuildRoot; } diff --git a/pkgs/development/libraries/icu/base.nix b/pkgs/development/libraries/icu/base.nix index 8ad58c5f90b..0a8cb7d4684 100644 --- a/pkgs/development/libraries/icu/base.nix +++ b/pkgs/development/libraries/icu/base.nix @@ -1,5 +1,5 @@ { version, sha256, patches ? [], patchFlags ? "" }: -{ stdenv, fetchurl, fixDarwinDylibNames +{ stdenv, lib, fetchurl, fixDarwinDylibNames # Cross-compiled icu4c requires a build-root of a native compile , buildRootOnly ? false, nativeBuildRoot }: @@ -20,7 +20,7 @@ let ''; # https://sourceware.org/glibc/wiki/Release/2.26#Removal_of_.27xlocale.h.27 - postPatch = if (stdenv.hostPlatform.libc == "glibc" || stdenv.hostPlatform.libc == "musl") + postPatch = if (stdenv.hostPlatform.libc == "glibc" || stdenv.hostPlatform.libc == "musl") && lib.versionOlder version "62.1" then "substituteInPlace i18n/digitlst.cpp --replace '<xlocale.h>' '<locale.h>'" else null; # won't find locale_t on darwin diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 787e223bdfd..398459415d6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10321,6 +10321,11 @@ in } // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4' })); + icu63 = callPackage ../development/libraries/icu/63.nix ({ + nativeBuildRoot = buildPackages.icu63.override { buildRootOnly = true; }; + } // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4' + })); icu = icu59; |