From 2c97992b74c4ae95c8dfaea1ef9075ef8d40c8a2 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Sat, 20 Dec 2025 17:40:18 +0100 Subject: [PATCH] libreoffice: fix build with gpgme 2 Since version 2.0.0 the C++ bindings to gpgme live in a separate package, i.e., gpgmepp. Signed-off-by: Marcin Serwin --- pkgs/applications/office/libreoffice/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 47e7b25747e9..b6207c808046 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -93,6 +93,7 @@ ncurses, libepoxy, gpgme, + gpgmepp, libwebp, abseil-cpp, libepubgen, @@ -358,7 +359,7 @@ stdenv.mkDerivation (finalAttrs: { # Fix this path to point to where the headers can actually be found instead. substituteInPlace configure.ac --replace-fail \ 'GPGMEPP_CFLAGS=-I/usr/include/gpgme++' \ - 'GPGMEPP_CFLAGS=-I${gpgme.dev}/include/gpgme++' + 'GPGMEPP_CFLAGS=-I${lib.getDev gpgmepp}/include/gpgme++' # Fix for Python 3.12 substituteInPlace configure.ac --replace-fail distutils.sysconfig sysconfig @@ -422,6 +423,7 @@ stdenv.mkDerivation (finalAttrs: { glm adwaita-icon-theme gpgme + gpgmepp graphite2 gtk3 (harfbuzz.override { withIcu = true; })