public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #22649: libxml2: add icuSupport ? false 

This causes no rebuilds by default.
This commit is contained in:
Vladimír Čunát 2017-02-11 11:54:49 +01:00
parent fb61e3ac04 52d6927413
commit db8ac6144e
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/libraries/libxml2/default.nix
View File

@ -1,8 +1,11 @@
{ stdenv, lib, fetchurl, zlib, xz, python2, findXMLCatalogs, libiconv, fetchpatch { stdenv, lib, fetchurl, fetchpatch
, pythonSupport ? (! stdenv ? cross) }: , zlib, xz, python2, findXMLCatalogs, libiconv
, pythonSupport ? (! stdenv ? cross)
, icuSupport ? false, icu ? null }:
let let
python = python2; python = python2;
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "libxml2-${version}"; name = "libxml2-${version}";
version = "2.9.4"; version = "2.9.4";
@ -37,9 +40,11 @@ in stdenv.mkDerivation rec {
# RUNPATH for that, leading to undefined references for its users. # RUNPATH for that, leading to undefined references for its users.
++ lib.optional stdenv.isFreeBSD xz; ++ 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" ]; ++ [ "--exec_prefix=$dev" ];
enableParallelBuilding = true; enableParallelBuilding = true;