libxml2: support python3
This commit is contained in:
parent
32b9e77388
commit
d0d04c26d7
@ -1,5 +1,5 @@
|
||||
{ stdenv, lib, fetchurl, fetchpatch
|
||||
, zlib, xz, python2, findXMLCatalogs
|
||||
, zlib, xz, python2, ncurses, findXMLCatalogs
|
||||
, pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform
|
||||
, icuSupport ? false, icu ? null
|
||||
, enableShared ? stdenv.hostPlatform.libc != "msvcrt"
|
||||
@ -37,6 +37,7 @@ in stdenv.mkDerivation rec {
|
||||
propagatedBuildOutputs = "out bin" + lib.optionalString pythonSupport " py";
|
||||
|
||||
buildInputs = lib.optional pythonSupport python
|
||||
++ lib.optional (pythonSupport && python?isPy3 && python.isPy3) ncurses
|
||||
# Libxml2 has an optional dependency on liblzma. However, on impure
|
||||
# platforms, it may end up using that from /usr/lib, and thus lack a
|
||||
# RUNPATH for that, leading to undefined references for its users.
|
||||
|
@ -3417,8 +3417,7 @@ in {
|
||||
libplist = disabledIf isPy3k
|
||||
(toPythonModule (pkgs.libplist.override{python2Packages=self; })).py;
|
||||
|
||||
libxml2 = disabledIf isPy3k
|
||||
(toPythonModule (pkgs.libxml2.override{pythonSupport=true; python2=python;})).py;
|
||||
libxml2 = toPythonModule (pkgs.libxml2.override{pythonSupport=true; python2=python;}).py;
|
||||
|
||||
libxslt = disabledIf isPy3k
|
||||
(toPythonModule (pkgs.libxslt.override{pythonSupport=true; python2=python; inherit (self) libxml2;})).py;
|
||||
|
Loading…
Reference in New Issue
Block a user