summary refs log tree commit diff
path: root/pkgs/applications/office
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2022-03-25 19:17:22 +0100
committerJan Tojnar <jtojnar@gmail.com>2022-03-25 19:27:18 +0100
commit91024781530c66bc61f09074c9fcd9bce7d11a87 (patch)
treec36a1e9062b7f4d3e3d697bb4234e7d820476c1a /pkgs/applications/office
parent534a73511ef95355ef9b11f31bf6deb9fdb84521 (diff)
downloadnixpkgs-91024781530c66bc61f09074c9fcd9bce7d11a87.tar
nixpkgs-91024781530c66bc61f09074c9fcd9bce7d11a87.tar.gz
nixpkgs-91024781530c66bc61f09074c9fcd9bce7d11a87.tar.bz2
nixpkgs-91024781530c66bc61f09074c9fcd9bce7d11a87.tar.lz
nixpkgs-91024781530c66bc61f09074c9fcd9bce7d11a87.tar.xz
nixpkgs-91024781530c66bc61f09074c9fcd9bce7d11a87.tar.zst
nixpkgs-91024781530c66bc61f09074c9fcd9bce7d11a87.zip
libreoffice: fix build with Poppler 22.03
Diffstat (limited to 'pkgs/applications/office')
-rw-r--r--pkgs/applications/office/libreoffice/default.nix10
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 1fe7598d0e1..5ebde5e10de 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -82,7 +82,15 @@ in (mkDrv rec {
     tar -xf ${srcs.translations}
   '';
 
-  patches = [ ./skip-failed-test-with-icu70.patch ];
+  patches = [
+    ./skip-failed-test-with-icu70.patch
+
+    # Fix build with poppler 22.03
+    (fetchurl {
+      url = "https://github.com/archlinux/svntogit-packages/raw/f82958b9538f86e41b51f1ba7134968d2f3788d1/trunk/poppler-22.03.0.patch";
+      sha256 = "5h4qJmx6Q3Q3dHUlSi8JXBziN2mAswGVWk5aDTLTwls=";
+    })
+  ];
 
   ### QT/KDE
   #