summary refs log tree commit diff
path: root/pkgs/development/libraries/libcdr
diff options
context:
space:
mode:
authorRyan Burns <rtburns@protonmail.com>2021-02-22 22:49:12 -0800
committerRyan Burns <rtburns@protonmail.com>2021-02-22 22:49:12 -0800
commite10bf0b3d0ae0281ad45a44764da5398147ab1b6 (patch)
tree4fd7db38bae1655ea651ceb38821eab3dc6159dd /pkgs/development/libraries/libcdr
parent8b6e6ae050083e05cce4b695db4522e9179ffd41 (diff)
downloadnixpkgs-e10bf0b3d0ae0281ad45a44764da5398147ab1b6.tar
nixpkgs-e10bf0b3d0ae0281ad45a44764da5398147ab1b6.tar.gz
nixpkgs-e10bf0b3d0ae0281ad45a44764da5398147ab1b6.tar.bz2
nixpkgs-e10bf0b3d0ae0281ad45a44764da5398147ab1b6.tar.lz
nixpkgs-e10bf0b3d0ae0281ad45a44764da5398147ab1b6.tar.xz
nixpkgs-e10bf0b3d0ae0281ad45a44764da5398147ab1b6.tar.zst
nixpkgs-e10bf0b3d0ae0281ad45a44764da5398147ab1b6.zip
libcdr: fix build
Diffstat (limited to 'pkgs/development/libraries/libcdr')
-rw-r--r--pkgs/development/libraries/libcdr/default.nix12
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/development/libraries/libcdr/default.nix b/pkgs/development/libraries/libcdr/default.nix
index 087c928b79c..b987c3dbb25 100644
--- a/pkgs/development/libraries/libcdr/default.nix
+++ b/pkgs/development/libraries/libcdr/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, libwpg, libwpd, lcms, pkg-config, librevenge, icu, boost, cppunit }:
+{ lib, stdenv, fetchurl, fetchpatch, libwpg, libwpd, lcms, pkg-config, librevenge, icu, boost, cppunit }:
 
 stdenv.mkDerivation rec {
   name = "libcdr-0.1.6";
@@ -8,6 +8,16 @@ stdenv.mkDerivation rec {
     sha256 = "0qgqlw6i25zfq1gf7f6r5hrhawlrgh92sg238kjpf2839aq01k81";
   };
 
+  patches = [
+    # Fix build with icu 68
+    # Remove in next release
+    (fetchpatch {
+      name = "libcdr-fix-icu-68";
+      url = "https://cgit.freedesktop.org/libreoffice/libcdr/patch/?id=bf3e7f3bbc414d4341cf1420c99293debf1bd894";
+      sha256 = "0cgra10p8ibgwn8y5q31jrpan317qj0ribzjs4jq0bwavjq92w2k";
+    })
+  ];
+
   buildInputs = [ libwpg libwpd lcms librevenge icu boost cppunit ];
 
   nativeBuildInputs = [ pkg-config ];