From bf170fec12fadd65070e190c0abbe1cca933b5a7 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Thu, 3 Aug 2023 20:45:03 +0200 Subject: libreoffice*: fixup build with curl-8.2.0 --- pkgs/applications/office/libreoffice/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'pkgs/applications') diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 70df53f1eb6b1..bec44b0b7ff3c 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchurl +, fetchpatch , lib , substituteAll , pam @@ -220,6 +221,12 @@ in # for 7.4. patches = lib.optionals (lib.versionAtLeast version "7.5") [ ./0001-Strip-away-BUILDCONFIG.patch + ] ++ [ + (fetchpatch { + name = "fix-curl-8.2.patch"; + url = "https://github.com/LibreOffice/core/commit/2a68dc02bd19a717d3c86873206fabed1098f228.diff"; + hash = "sha256-C+kts+oaLR3+GbnX/wrFguF7SzgerNataxP0SPxhyY8="; + }) ]; # libreoffice tries to reference the BUILDCONFIG (e.g. PKG_CONFIG_PATH) -- cgit 1.4.1