summary refs log tree commit diff
path: root/pkgs/applications/office
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2022-08-18 17:42:24 +0200
committerVladimír Čunát <v@cunat.cz>2022-08-18 17:42:24 +0200
commit9233d4617120154af57879a2f8095c1d71501df4 (patch)
tree832af9d06b02ea18ec68c034c342e1658aa5e119 /pkgs/applications/office
parent6b4195366acc308eeeaadf628e3c984fd9ee8e5c (diff)
downloadnixpkgs-9233d4617120154af57879a2f8095c1d71501df4.tar
nixpkgs-9233d4617120154af57879a2f8095c1d71501df4.tar.gz
nixpkgs-9233d4617120154af57879a2f8095c1d71501df4.tar.bz2
nixpkgs-9233d4617120154af57879a2f8095c1d71501df4.tar.lz
nixpkgs-9233d4617120154af57879a2f8095c1d71501df4.tar.xz
nixpkgs-9233d4617120154af57879a2f8095c1d71501df4.tar.zst
nixpkgs-9233d4617120154af57879a2f8095c1d71501df4.zip
fixup! libreoffice*: hack-fix build after gpgme update
Diffstat (limited to 'pkgs/applications/office')
-rw-r--r--pkgs/applications/office/libreoffice/gpgme-1.18.patch10
1 files changed, 10 insertions, 0 deletions
diff --git a/pkgs/applications/office/libreoffice/gpgme-1.18.patch b/pkgs/applications/office/libreoffice/gpgme-1.18.patch
new file mode 100644
index 00000000000..f554371e91b
--- /dev/null
+++ b/pkgs/applications/office/libreoffice/gpgme-1.18.patch
@@ -0,0 +1,10 @@
+The way this check mixes C and C++ started to cause issues since gpgme 1.18.0
+But we can confidently skip the function check anyway.
+--- a/configure.ac
++++ b/configure.ac
+@@ -12302,4 +12302 @@
+-        # progress_callback is the only func with plain C linkage
+-        # checking for it also filters out older, KDE-dependent libgpgmepp versions
+-        AC_CHECK_LIB(gpgmepp, progress_callback, [ GPGMEPP_LIBS=-lgpgmepp ],
+-            [AC_MSG_ERROR(gpgmepp not found or not functional)], [])
++        GPGMEPP_LIBS=-lgpgmepp