From e10bf0b3d0ae0281ad45a44764da5398147ab1b6 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Mon, 22 Feb 2021 22:49:12 -0800 Subject: [PATCH] libcdr: fix build --- pkgs/development/libraries/libcdr/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) 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 ];