diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2024-06-22 17:19:17 +0200 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2024-06-24 12:18:31 +0200 |
| commit | 88b3421982eb5b4549ca0bd91571f698f3cf33b8 (patch) | |
| tree | d348bde7e697c18d1e2bc2ec655114df6a9c1d8f /pkgs/applications | |
| parent | 0cd882cba0d926e8c9125f80b6da5d576ad24e01 (diff) | |
libreoffice: apply patch for icu74 compat
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/office/libreoffice/default.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 0b85e05e5ef09..81acbb4ed6ae1 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchurl +, fetchpatch2 , lib , pam , python311 @@ -244,6 +245,11 @@ in stdenv.mkDerivation (finalAttrs: { # - the remaining tests have notes in the patch # FIXME: get rid of this ASAP ./skip-broken-tests.patch + (fetchpatch2 { + name = "icu74-compat.patch"; + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libreoffice-fresh/-/raw/main/libreoffice-7.5.8.2-icu-74-compatibility.patch?ref_type=heads.patch"; + hash = "sha256-OGBPIVQj8JTYlkKywt4QpH7ULAzKmet5jTLztGpIS0Y="; + }) ] ++ lib.optionals (variant == "still") [ # Remove build config to reduce the amount of `-dev` outputs in the # runtime closure. This behavior was introduced by upstream in commit |