diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2021-09-26 20:45:05 +0100 |
|---|---|---|
| committer | Sergei Trofimovich <slyich@gmail.com> | 2021-09-26 20:46:24 +0100 |
| commit | 1633ceac5124a4dd8e90c5e00f1087740a8b794a (patch) | |
| tree | d885039bb062ecced522f5e1e23c551be75d573c | |
| parent | 8f82d3da49b9c9c41d8ccc2ef05b4eb7a715db7f (diff) | |
| download | nixpkgs-1633ceac5124a4dd8e90c5e00f1087740a8b794a.tar nixpkgs-1633ceac5124a4dd8e90c5e00f1087740a8b794a.tar.gz nixpkgs-1633ceac5124a4dd8e90c5e00f1087740a8b794a.tar.bz2 nixpkgs-1633ceac5124a4dd8e90c5e00f1087740a8b794a.tar.lz nixpkgs-1633ceac5124a4dd8e90c5e00f1087740a8b794a.tar.xz nixpkgs-1633ceac5124a4dd8e90c5e00f1087740a8b794a.tar.zst nixpkgs-1633ceac5124a4dd8e90c5e00f1087740a8b794a.zip | |
calligra: fix fontconfig underlinking
Pull part of upstream patch related to fontconfig linking fix. Closes: https://github.com/NixOS/nixpkgs/issues/137794
| -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 2ecc334c3d2..03437742612 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 = [ |