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

libreoffice-collabora: comment out the duplicate patch

Browse Source 
Fix duplication introduced in #455940 while fixing the build of other branches
This commit is contained in:
7c6f434c
2025-10-27 09:28:29 +01:00
parent 1dd2128f5f
commit b7eef3bb56
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/office/libreoffice/default.nix
+8 -5
View File
@@ -341,11 +341,14 @@ stdenv.mkDerivation (finalAttrs: {
includes = [ "sdext/*" ];
hash = "sha256-8yipl5ln1yCNfVM8SuWowsw1Iy/SXIwbdT1ZfNw4cJA=";
})
# Fix build with Poppler 25.10
(fetchpatch2 {
url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libreoffice-still/-/raw/f5241554e4a0f6fd95ac4e5cc398a30243407e6a/fix_build_with_poppler_25.10.patch";
hash = "sha256-lbPOkc1HeT5Qsp6XfVyVJtmvSL68qTrmbd3q9lvKSu8=";
})
# Currently included in the condition above
# Uncomment if Collabora is again the only version needing it
# Remove if Collabora is updated far enough not to need it anymore
## Fix build with Poppler 25.10
#(fetchpatch2 {
# url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libreoffice-still/-/raw/f5241554e4a0f6fd95ac4e5cc398a30243407e6a/fix_build_with_poppler_25.10.patch";
# hash = "sha256-lbPOkc1HeT5Qsp6XfVyVJtmvSL68qTrmbd3q9lvKSu8=";
#})
]
++ lib.optionals (variant == "collabora") [
./fix-unpack-collabora.patch