summary refs log tree commit diff
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2019-06-05 22:54:02 +0200
committerVladimír Čunát <v@cunat.cz>2019-06-05 22:54:02 +0200
commit0d29488705189aa12cb0fa459c2a04dec9c47031 (patch)
tree627eeb33ea75cdccd798a93bc00e7a8e4cf17e52
parent576af1718704f9eca5db0983a94edcf8d06caddd (diff)
downloadnixpkgs-0d29488705189aa12cb0fa459c2a04dec9c47031.tar
nixpkgs-0d29488705189aa12cb0fa459c2a04dec9c47031.tar.gz
nixpkgs-0d29488705189aa12cb0fa459c2a04dec9c47031.tar.bz2
nixpkgs-0d29488705189aa12cb0fa459c2a04dec9c47031.tar.lz
nixpkgs-0d29488705189aa12cb0fa459c2a04dec9c47031.tar.xz
nixpkgs-0d29488705189aa12cb0fa459c2a04dec9c47031.tar.zst
nixpkgs-0d29488705189aa12cb0fa459c2a04dec9c47031.zip
sword: fixup build with icu >= 61
/cc #60250 (2fe63c8).
-rw-r--r--pkgs/development/libraries/sword/default.nix7
1 files changed, 6 insertions, 1 deletions
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";