Commit 81e609e8 authored by Jan Tojnar's avatar Jan Tojnar
Browse files

libreoffice-fresh: Fix build 

The patch is part of libreoffice 25.8.2.1.
parent 0e27c207

pkgs/applications/office/libreoffice/default.nix

+4 −3
Original line number Diff line number Diff line
@@ -313,7 +313,8 @@ 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";
@@ -321,10 +322,10 @@ stdenv.mkDerivation (finalAttrs: { 
      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

    (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=";

    })

  ]