diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2021-10-12 21:13:51 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-12 21:13:51 +0200 |
commit | 149911326349ef6302f27de598ce115cf5066922 (patch) | |
tree | 7332a03ae3e693a75ff78acb9faa5347a542f27a /pkgs | |
parent | 161b9c2614baa4fe51ef48b2fc836a3070402082 (diff) | |
parent | 1633ceac5124a4dd8e90c5e00f1087740a8b794a (diff) |
Merge pull request #139565 from trofi/fix-calligra-underlinking
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/office/calligra/default.nix | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index 2ecc334c3d20b..03437742612fc 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchurl, extra-cmake-modules, kdoctools +{ mkDerivation, lib, fetchpatch, fetchurl, extra-cmake-modules, kdoctools , boost, qtwebkit, qtx11extras, shared-mime-info , breeze-icons, kactivities, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets , kcoreaddons, kdbusaddons, kdiagram, kguiaddons, khtml, ki18n @@ -21,6 +21,17 @@ mkDerivation rec { sha256 = "0iqi6z6gkck2afgy200dacgcspq7i7887alcj0pklm08hbmsdy5i"; }; + patches = [ + # Fix fontconfig underlinking: https://github.com/NixOS/nixpkgs/issues/137794 + # Can be dropped on next release. + (fetchpatch { + name = "fix-fontconfig-linking.patch"; + url = "https://github.com/KDE/calligra/commit/62f510702ef9c34ac50f8d8601a4290ab558464c.patch"; + sha256 = "11dzrp9q05dmvnwp4vk4ihcibqcf4xyr0ijscpi716cyy730flma"; + excludes = [ "CMakeLists.txt" ]; + }) + ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ |