public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libreoffice-still: apply the patch for ICU 58, see 17126

This commit is contained in:
Michael Raskin 2017-03-10 09:48:54 +01:00
parent b36ee3d387
commit f3a4f31554
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/office/libreoffice/still.nix
View File

@ -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)

2
pkgs/top-level/all-packages.nix
View File

@ -14268,9 +14268,7 @@ with pkgs;
lcms = lcms2;
harfbuzz = harfbuzz.override {
withIcu = true; withGraphite2 = true;
icu = icu_57;
};
icu = icu_57;
});