From 52d692741383d7ba2a2514098fb1fd81235a2f3b Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 11 Feb 2017 11:15:41 +0800 Subject: [PATCH] libxml2: add optional icu support --- 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 80354b10f3b..930227ed243 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -1,8 +1,11 @@ -{ stdenv, lib, fetchurl, zlib, xz, python2, findXMLCatalogs, libiconv, fetchpatch -, pythonSupport ? (! stdenv ? cross) }: +{ stdenv, lib, fetchurl, fetchpatch +, zlib, xz, python2, findXMLCatalogs, libiconv +, pythonSupport ? (! stdenv ? cross) +, icuSupport ? false, icu ? null }: let python = python2; + in stdenv.mkDerivation rec { name = "libxml2-${version}"; version = "2.9.4"; @@ -37,9 +40,11 @@ in 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 pythonSupport "--with-python=${python}" + configureFlags = + lib.optional pythonSupport "--with-python=${python}" + ++ lib.optional icuSupport "--with-icu" ++ [ "--exec_prefix=$dev" ]; enableParallelBuilding = true;