diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2014-06-30 17:39:12 +0400 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2014-06-30 17:39:12 +0400 |
| commit | 7caec7414294290888813e4fb83835d4e3250b92 (patch) | |
| tree | 9520bcc0f0fea6fbf87e15365dbf76fdab14862d /pkgs/top-level | |
| parent | 0b1b4e5870a796d664269180d71fec631cca43d8 (diff) | |
| parent | a72bb396a271310e25922256a4b0c526fe0ca90a (diff) | |
Merge pull request #3118 from NixOS/libreoffice-update-4.2.5
Libreoffice update 4.2.5
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 663ac39eeb55..20e9d1db657e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9005,7 +9005,7 @@ let inherit (perlPackages) ArchiveZip CompressZlib; inherit (gnome) GConf ORBit2 gnome_vfs; zip = zip.override { enableNLS = false; }; - boost = boost149; + boost = boost155; jdk = openjdk; fontsConf = makeFontsConf { fontDirectories = [ @@ -9014,7 +9014,9 @@ let }; clucene_core = clucene_core_2; lcms = lcms2; - mdds = mdds_0_7_1; + harfbuzz = harfbuzz.override { + withIcu = true; withGraphite2 = true; + }; }; liferea = callPackage ../applications/networking/newsreaders/liferea { }; |