From 0d29488705189aa12cb0fa459c2a04dec9c47031 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 5 Jun 2019 22:54:02 +0200 Subject: [PATCH] sword: fixup build with icu >= 61 /cc #60250 (2fe63c8). --- pkgs/development/libraries/sword/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/sword/default.nix b/pkgs/development/libraries/sword/default.nix index afb168d5aa2..a8a110cf9b1 100644 --- a/pkgs/development/libraries/sword/default.nix +++ b/pkgs/development/libraries/sword/default.nix @@ -24,7 +24,12 @@ stdenv.mkDerivation rec { }) ]; - configureFlags = [ "--without-conf" "--enable-tests=no CXXFLAGS=-Wno-unused-but-set-variable" ]; + configureFlags = [ "--without-conf" "--enable-tests=no" ]; + CXXFLAGS = [ + "-Wno-unused-but-set-variable" + # compat with icu61+ https://github.com/unicode-org/icu/blob/release-64-2/icu4c/readme.html#L554 + "-DU_USING_ICU_NAMESPACE=1" + ]; meta = with stdenv.lib; { description = "A software framework that allows research manipulation of Biblical texts";