diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 2c82feb8a489..28f3c39a3573 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -429,6 +429,46 @@ stdenv.mkDerivation (finalAttrs: { }) ./fix-unpack-collabora.patch + + # Add missing climits includes + (fetchpatch2 { + url = "https://github.com/LibreOffice/core/commit/6ebc3c540f2aa13363e3dcb32a44bfa2c7f66a9f.patch"; + hash = "sha256-5GCosJryorH1P1Z2Zjey7oEC3seLHN5kH/ar4U7E74E="; + }) + (fetchpatch2 { + url = "https://github.com/LibreOffice/core/commit/0084c2b22ce26084df5a379135ba8ac174585ac0.patch"; + hash = "sha256-zssmbzfaZX2sBdHbzm+aIC8ncidp3eupQoUloeGdPcQ="; + }) + (fetchpatch2 { + url = "https://github.com/LibreOffice/core/commit/19c32b44fead600118377417012b111a4f238766.patch"; + hash = "sha256-jO7oFEfoL7V1dj67vwDAEp2BwjQvfva4zV8sVAAc+2g="; + }) + + # Add missing limits.h include + (fetchpatch2 { + url = "https://github.com/LibreOffice/core/commit/a6325b777b7bb9e1c760a4f1a02d48ba0889a7b1.patch"; + hash = "sha256-QECBAdJ+4Q8c2kbdadNxzgDEebLvPy9cvRb34O7m5bA="; + }) + + # Add missing cstdint includes + (fetchpatch2 { + url = "https://github.com/LibreOffice/core/commit/47cabcb187dfbccb36ee02513998fbfcee509d5e.patch"; + hash = "sha256-q883AMTtLzXwbwNRytCk6qiFA1snzba4JUsr7IaUEvI="; + }) + (fetchpatch2 { + url = "https://github.com/LibreOffice/core/commit/0fede06b020fa0327877f4a8722290d48a742a2c.patch"; + hash = "sha256-8w89mtZuFvpZU0GVZoWPZVBM+UlgnbTYxoDJ8Ss64Bo="; + }) + (fetchpatch2 { + url = "https://github.com/LibreOffice/core/commit/aa9a194a99cec1dbcee9226b703fdcf9b62962d7.patch"; + hash = "sha256-Eztv186ke97u0ucdd3jQmJaxtrxnsiWWE/qVOBc2uGc="; + }) + + # Add missing stdint.h include + (fetchpatch2 { + url = "https://github.com/LibreOffice/core/commit/d0265596672d78ad6f3980ff6fb900535aefd11f.patch"; + hash = "sha256-tp7MW+8ExivGKKWjLy60lxWNf2hXF+jCD0pajo+YbVo="; + }) ] ++ lib.optionals (lib.versionAtLeast version "26.8" && lib.versionOlder version "26.8.999") [ ./26.8-add-dir-prereq.patch