BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

calligra: fix fontconfig underlinking

Browse source 
Pull part of upstream patch related to fontconfig linking fix.

Closes: https://github.com/NixOS/nixpkgs/issues/137794
This commit is contained in:
Sergei Trofimovich 2021-09-26 20:45:05 +01:00
parent 8f82d3da49
commit 1633ceac51
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/applications/office/calligra/default.nix
View file

@ -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 = [