From 369fd67a5e34a693aa63e6ec6ff82f0185e348a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 11 Feb 2017 11:54:49 +0100
Subject: [PATCH] Merge #22649: libxml2: add icuSupport ? false

This causes no rebuilds by default.  Fixes #22623, kind of.

(cherry picked from commit db8ac6144eb26fb2b1a93142e42bafef6a31c6ea)
---
 pkgs/development/libraries/libxml2/default.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index c6803683beb9..50c9b71ce8df 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -1,7 +1,10 @@
-{ stdenv, lib, fetchurl, zlib, xz, python, findXMLCatalogs, libiconv, fetchpatch
-, supportPython ? (! stdenv ? cross) }:
+{ stdenv, lib, fetchurl, fetchpatch
+, zlib, xz, python, findXMLCatalogs, libiconv
+, supportPython ? (! stdenv ? cross)
+, icuSupport ? false, icu ? null }:
 
 stdenv.mkDerivation rec {
+
   name = "libxml2-${version}";
   version = "2.9.4";
 
@@ -35,9 +38,11 @@ stdenv.mkDerivation rec {
     # RUNPATH for that, leading to undefined references for its users.
     ++ lib.optional stdenv.isFreeBSD xz;
 
-  propagatedBuildInputs = [ zlib findXMLCatalogs ];
+  propagatedBuildInputs = [ zlib findXMLCatalogs ] ++ lib.optional icuSupport icu;
 
-  configureFlags = lib.optional supportPython "--with-python=${python}"
+  configureFlags =
+       lib.optional supportPython "--with-python=${python}"
+    ++ lib.optional icuSupport    "--with-icu"
     ++ [ "--exec_prefix=$dev" ];
 
   enableParallelBuilding = true;