diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2017-03-10 09:48:54 +0100 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2017-03-10 09:48:54 +0100 |
| commit | f3a4f31554f655440181aa6085ed7fea5b4c24e4 (patch) | |
| tree | 2fd05ca44d6db4a6ea5b0c0ba27f36f24ef88be9 /pkgs | |
| parent | b36ee3d387b7ec6b4bfe3bd7c130806c4b1bbfa8 (diff) | |
| download | nixlib-f3a4f31554f655440181aa6085ed7fea5b4c24e4.tar nixlib-f3a4f31554f655440181aa6085ed7fea5b4c24e4.tar.gz nixlib-f3a4f31554f655440181aa6085ed7fea5b4c24e4.tar.bz2 nixlib-f3a4f31554f655440181aa6085ed7fea5b4c24e4.tar.lz nixlib-f3a4f31554f655440181aa6085ed7fea5b4c24e4.tar.xz nixlib-f3a4f31554f655440181aa6085ed7fea5b4c24e4.tar.zst nixlib-f3a4f31554f655440181aa6085ed7fea5b4c24e4.zip | |
libreoffice-still: apply the patch for ICU 58, see 17126
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/office/libreoffice/still.nix | 7 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index 6897597e7ef8..b973a4192bba 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) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9ce3089ebbd5..4e4362e0c804 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14268,9 +14268,7 @@ with pkgs; lcms = lcms2; harfbuzz = harfbuzz.override { withIcu = true; withGraphite2 = true; - icu = icu_57; }; - icu = icu_57; }); |