From dce66a7268dfdf0377a2d060da4c48cf7351559c Mon Sep 17 00:00:00 2001 From: gnidorah Date: Sat, 23 Dec 2017 21:43:07 +0300 Subject: calligra: fix build --- pkgs/applications/office/calligra/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'pkgs/applications/office/calligra/default.nix') diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index bec19d675cb..1537dd9b03f 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, fetchurl, extra-cmake-modules, kdoctools, makeWrapper, + mkDerivation, lib, fetchurl, fetchpatch, extra-cmake-modules, kdoctools, makeWrapper, boost, qtwebkit, qtx11extras, shared_mime_info, breeze-icons, kactivities, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdiagram, kguiaddons, khtml, ki18n, @@ -23,6 +23,16 @@ mkDerivation rec { sha256 = "1cjdd7sx1zhas6lhw0dzhrnki790jkf93f88wn6z9yrww32dsas5"; }; + enableParallelBuilding = true; + + patches = [ + (fetchpatch { + name = "calligra-build-with-newer-kcalcore.patch"; + url = "https://github.com/KDE/calligra/commit/9a02a545e8606aa91aff2038da137226a9432e1a.diff"; + sha256 = "08xays41v6rfnc31vixf4vbz8zmi2x5lfnk7f82bm4sgmpgfxwa0"; + }) + ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ]; buildInputs = [ -- cgit 1.4.1