pyrox.dev
calligra: fix fontconfig underlinking
Pull part of upstream patch related to fontconfig linking fix.
Closes: https://github.com/NixOS/nixpkgs/issues/137794
+12
-1
pkgs/applications/office/calligra/default.nix
+12
-1
pkgs/applications/office/calligra/default.nix
···
1
-
{ mkDerivation, lib, fetchurl, extra-cmake-modules, kdoctools
2
, boost, qtwebkit, qtx11extras, shared-mime-info
3
, breeze-icons, kactivities, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets
4
, kcoreaddons, kdbusaddons, kdiagram, kguiaddons, khtml, ki18n
···
20
url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz";
21
sha256 = "0iqi6z6gkck2afgy200dacgcspq7i7887alcj0pklm08hbmsdy5i";
22
};
23
24
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
25
···
1
+
{ mkDerivation, lib, fetchpatch, fetchurl, extra-cmake-modules, kdoctools
2
, boost, qtwebkit, qtx11extras, shared-mime-info
3
, breeze-icons, kactivities, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets
4
, kcoreaddons, kdbusaddons, kdiagram, kguiaddons, khtml, ki18n
···
20
url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz";
21
sha256 = "0iqi6z6gkck2afgy200dacgcspq7i7887alcj0pklm08hbmsdy5i";
22
};
23
+
24
+
patches = [
25
+
# Fix fontconfig underlinking: https://github.com/NixOS/nixpkgs/issues/137794
26
+
# Can be dropped on next release.
27
+
(fetchpatch {
28
+
name = "fix-fontconfig-linking.patch";
29
+
url = "https://github.com/KDE/calligra/commit/62f510702ef9c34ac50f8d8601a4290ab558464c.patch";
30
+
sha256 = "11dzrp9q05dmvnwp4vk4ihcibqcf4xyr0ijscpi716cyy730flma";
31
+
excludes = [ "CMakeLists.txt" ];
32
+
})
33
+
];
34
35
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
36