gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

{libreoffice-{fresh,still},calligra}: Fix build (#455940)

Browse Source
This commit is contained in:
K900
2025-10-27 07:22:45 +00:00
committed by GitHub
parent 614b9fff80 c9b78f12c8
commit 87f8c5db95
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/office/libreoffice/default.nix
+10 -4
View File
@@ -313,18 +313,24 @@ stdenv.mkDerivation (finalAttrs: {
# Revert part of https://github.com/LibreOffice/core/commit/6f60670877208612b5ea320b3677480ef6508abb that broke zlib linking
./readd-explicit-zlib-link.patch
]
++ lib.optionals (lib.versionOlder version "25.8.2.1") [
# Backport patch to fix build with Poppler 25.09
(fetchpatch2 {
url = "https://github.com/LibreOffice/core/commit/7848e02819c007026952a3fdc9da0961333dc079.patch";
includes = [ "sdext/*" ];
hash = "sha256-Nw6GFmkFy13w/ktCxw5s7SHL34auP1BQ9JvQnQ65aVU=";
})
]
++ lib.optionals (lib.versionAtLeast version "25.8") [
# Fix build with Poppler 25.10
(fetchpatch2 {
url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libreoffice-fresh/-/raw/41e58e117c356af2be83993595caf61f9f30cc89/poppler-25.10.patch";
url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libreoffice-still/-/raw/f5241554e4a0f6fd95ac4e5cc398a30243407e6a/fix_build_with_poppler_25.10.patch";
hash = "sha256-lbPOkc1HeT5Qsp6XfVyVJtmvSL68qTrmbd3q9lvKSu8=";
})
]
++ lib.optionals (lib.versionAtLeast version "25.8.2.2") [
# Fix build with Poppler 25.10
(fetchpatch2 {
url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libreoffice-fresh/-/raw/f7b0e4385108b95c134599502a7bccf0a41925c8/poppler-25.10.patch";
hash = "sha256-KMsjDtRRH8Vy/FXaVwxUo0Ww10PCE0sK8+ZL0Ja2kJQ=";
})
]
pkgs/kde/gear/calligra/default.nix
+9
View File
@@ -1,6 +1,7 @@
{
mkKdeDerivation,
lib,
fetchpatch,
boost,
eigen,
gsl,
@@ -26,6 +27,14 @@
mkKdeDerivation {
pname = "calligra";
patches = [
# Fix build with Poppler 25.10
(fetchpatch {
url = "https://invent.kde.org/office/calligra/-/commit/45e8b302bce1d318f310ea13599d7ce84acc477e.patch";
hash = "sha256-TECB3eo24+gI8TXL8gw9BIdFWqw0JBKCWpoNVqBSan8=";
})
];
extraBuildInputs = [
boost
eigen