Added arguments to the libxml2 Nix expression to control the creation of Python bindings. De default libxml2 in all-packages-generic now creates Python bindings for libxml2.
svn path=/nixpkgs/trunk/; revision=1297
This commit is contained in:
parent
51cdaa0338
commit
d1003bca3b
@ -1,12 +1,20 @@
|
|||||||
{stdenv, fetchurl, zlib}:
|
{stdenv, fetchurl, zlib, python ? null, pythonSupport ? true}:
|
||||||
|
|
||||||
assert zlib != null;
|
assert zlib != null;
|
||||||
|
assert pythonSupport -> python != null;
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "libxml2-2.6.8";
|
name = "libxml2-2.6.8";
|
||||||
|
builder = ./builder.sh;
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = ftp://ftp.gnome.org/pub/GNOME/sources/libxml2/2.6/libxml2-2.6.8.tar.bz2;
|
url = ftp://ftp.gnome.org/pub/GNOME/sources/libxml2/2.6/libxml2-2.6.8.tar.bz2;
|
||||||
md5 = "f8a0dc1983f67db388baa0f7c65d2b70";
|
md5 = "f8a0dc1983f67db388baa0f7c65d2b70";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
python = if pythonSupport then python else null;
|
||||||
|
inherit pythonSupport;
|
||||||
|
|
||||||
|
buildInputs = if pythonSupport then [python] else [];
|
||||||
propagatedBuildInputs = [zlib];
|
propagatedBuildInputs = [zlib];
|
||||||
}
|
}
|
||||||
|
@ -422,7 +422,7 @@ rec {
|
|||||||
};
|
};
|
||||||
|
|
||||||
libxml2 = (import ../development/libraries/libxml2) {
|
libxml2 = (import ../development/libraries/libxml2) {
|
||||||
inherit fetchurl stdenv zlib;
|
inherit fetchurl stdenv zlib python;
|
||||||
};
|
};
|
||||||
|
|
||||||
libxslt = (import ../development/libraries/libxslt) {
|
libxslt = (import ../development/libraries/libxslt) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user