diff options
| author | gnidorah <gnidorah@users.noreply.github.com> | 2017-12-23 21:43:07 +0300 |
|---|---|---|
| committer | gnidorah <gnidorah@users.noreply.github.com> | 2017-12-24 12:54:20 +0300 |
| commit | dce66a7268dfdf0377a2d060da4c48cf7351559c (patch) | |
| tree | 79202d1a0c99e9eb46428080313ea76b3e23cb91 /pkgs/applications/office/calligra/default.nix | |
| parent | a54a5d4bb03f386ff80e6569128e0f412482daf7 (diff) | |
| download | nixpkgs-dce66a7268dfdf0377a2d060da4c48cf7351559c.tar nixpkgs-dce66a7268dfdf0377a2d060da4c48cf7351559c.tar.gz nixpkgs-dce66a7268dfdf0377a2d060da4c48cf7351559c.tar.bz2 nixpkgs-dce66a7268dfdf0377a2d060da4c48cf7351559c.tar.lz nixpkgs-dce66a7268dfdf0377a2d060da4c48cf7351559c.tar.xz nixpkgs-dce66a7268dfdf0377a2d060da4c48cf7351559c.tar.zst nixpkgs-dce66a7268dfdf0377a2d060da4c48cf7351559c.zip | |
calligra: fix build
Diffstat (limited to 'pkgs/applications/office/calligra/default.nix')
| -rw-r--r-- | pkgs/applications/office/calligra/default.nix | 12 |
1 files changed, 11 insertions, 1 deletions
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 = [ |