Merge #22649: libxml2: add icuSupport ? false

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

(cherry picked from commit db8ac6144e)
This commit is contained in:
Vladimír Čunát
2017-02-11 11:54:49 +01:00
parent 498b5c8119
commit 369fd67a5e

View File

@@ -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;