From 328eb9da7caf8ea4a16ea1224b39dc40b3f222ec Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 10 Mar 2017 09:48:54 +0100 Subject: [PATCH] libreoffice-still: apply the patch for ICU 58 see #17126 (cherry picked from commit f3a4f31554f655440181aa6085ed7fea5b4c24e4) --- pkgs/applications/office/libreoffice/still.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index 329b292da27c3..1fab2f5f6d9b1 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -72,6 +72,13 @@ in stdenv.mkDerivation rec { configureScript = "./autogen.sh"; dontUseCmakeConfigure = true; + # ICU 58, included in 5.3.x + patches = [(fetchurl { + url = "https://gerrit.libreoffice.org/gitweb?p=core.git;a=patch;h=3e42714c76b1347babfdea0564009d8d82a83af4"; + sha256 = "10bid0jdw1rpdsqwzzk3r4rp6bjs2cvi82h7anz2m1amfjdv86my"; + name = "libreoffice-5.2.x-icu4c-58.patch"; + })]; + postUnpack = '' mkdir -v $sourceRoot/src '' + (stdenv.lib.concatMapStrings (f: "ln -sfv ${f} $sourceRoot/src/${f.md5 or f.outputHash}-${f.name}\nln -sfv ${f} $sourceRoot/src/${f.name}\n") srcs.third_party)