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

libreoffice-fresh: Fix build

Browse Source 
The patch is part of libreoffice 25.8.2.1.
This commit is contained in:
Jan Tojnar
2025-10-26 18:23:37 +01:00
parent 0e27c20732
commit 81e609e813
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/office/libreoffice/default.nix
View File

@@ -313,7 +313,8 @@ stdenv.mkDerivation (finalAttrs: {
# Revert part of https://github.com/LibreOffice/core/commit/6f60670877208612b5ea320b3677480ef6508abb that broke zlib linking # Revert part of https://github.com/LibreOffice/core/commit/6f60670877208612b5ea320b3677480ef6508abb that broke zlib linking
./readd-explicit-zlib-link.patch ./readd-explicit-zlib-link.patch
]
++ lib.optionals (lib.versionOlder version "25.8.2.1") [
# Backport patch to fix build with Poppler 25.09 # Backport patch to fix build with Poppler 25.09
(fetchpatch2 { (fetchpatch2 {
url = "https://github.com/LibreOffice/core/commit/7848e02819c007026952a3fdc9da0961333dc079.patch"; url = "https://github.com/LibreOffice/core/commit/7848e02819c007026952a3fdc9da0961333dc079.patch";
@@ -321,10 +322,10 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-Nw6GFmkFy13w/ktCxw5s7SHL34auP1BQ9JvQnQ65aVU="; hash = "sha256-Nw6GFmkFy13w/ktCxw5s7SHL34auP1BQ9JvQnQ65aVU=";
}) })
] ]
++ lib.optionals (lib.versionAtLeast version "25.8") [ ++ lib.optionals (lib.versionAtLeast version "25.8.2.2") [
# Fix build with Poppler 25.10 # Fix build with Poppler 25.10
(fetchpatch2 { (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-fresh/-/raw/f7b0e4385108b95c134599502a7bccf0a41925c8/poppler-25.10.patch";
hash = "sha256-KMsjDtRRH8Vy/FXaVwxUo0Ww10PCE0sK8+ZL0Ja2kJQ="; hash = "sha256-KMsjDtRRH8Vy/FXaVwxUo0Ww10PCE0sK8+ZL0Ja2kJQ=";
}) })
] ]