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

libxml2: support python3

Browse Source
This commit is contained in:
Frederik Rietdijk 2018-10-17 09:35:45 +02:00 committed by Frederik Rietdijk
parent 32b9e77388
commit d0d04c26d7
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, fetchpatch { stdenv, lib, fetchurl, fetchpatch
, zlib, xz, python2, findXMLCatalogs , zlib, xz, python2, ncurses, findXMLCatalogs
, pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform , pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform
, icuSupport ? false, icu ? null , icuSupport ? false, icu ? null
, enableShared ? stdenv.hostPlatform.libc != "msvcrt" , enableShared ? stdenv.hostPlatform.libc != "msvcrt"
@ -37,6 +37,7 @@ in stdenv.mkDerivation rec {
propagatedBuildOutputs = "out bin" + lib.optionalString pythonSupport " py"; propagatedBuildOutputs = "out bin" + lib.optionalString pythonSupport " py";
buildInputs = lib.optional pythonSupport python buildInputs = lib.optional pythonSupport python
++ lib.optional (pythonSupport && python?isPy3 && python.isPy3) ncurses
# Libxml2 has an optional dependency on liblzma. However, on impure # Libxml2 has an optional dependency on liblzma. However, on impure
# platforms, it may end up using that from /usr/lib, and thus lack a # platforms, it may end up using that from /usr/lib, and thus lack a
# RUNPATH for that, leading to undefined references for its users. # RUNPATH for that, leading to undefined references for its users.

3
pkgs/top-level/python-packages.nix
View File

@ -3417,8 +3417,7 @@ in {
libplist = disabledIf isPy3k libplist = disabledIf isPy3k
(toPythonModule (pkgs.libplist.override{python2Packages=self; })).py; (toPythonModule (pkgs.libplist.override{python2Packages=self; })).py;
libxml2 = disabledIf isPy3k libxml2 = toPythonModule (pkgs.libxml2.override{pythonSupport=true; python2=python;}).py;
(toPythonModule (pkgs.libxml2.override{pythonSupport=true; python2=python;})).py;
libxslt = disabledIf isPy3k libxslt = disabledIf isPy3k
(toPythonModule (pkgs.libxslt.override{pythonSupport=true; python2=python; inherit (self) libxml2;})).py; (toPythonModule (pkgs.libxslt.override{pythonSupport=true; python2=python; inherit (self) libxml2;})).py;