diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-10-17 09:35:45 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2018-10-17 10:00:20 +0200 |
| commit | d0d04c26d7a06dee755fe85969c9a4de830169ae (patch) | |
| tree | cbb7ba941ffc4d0edd68ba567a74582f058bf38f | |
| parent | 32b9e77388aaf188f6598402d5eac93096fede61 (diff) | |
| download | nixlib-d0d04c26d7a06dee755fe85969c9a4de830169ae.tar nixlib-d0d04c26d7a06dee755fe85969c9a4de830169ae.tar.gz nixlib-d0d04c26d7a06dee755fe85969c9a4de830169ae.tar.bz2 nixlib-d0d04c26d7a06dee755fe85969c9a4de830169ae.tar.lz nixlib-d0d04c26d7a06dee755fe85969c9a4de830169ae.tar.xz nixlib-d0d04c26d7a06dee755fe85969c9a4de830169ae.tar.zst nixlib-d0d04c26d7a06dee755fe85969c9a4de830169ae.zip | |
libxml2: support python3
| -rw-r--r-- | pkgs/development/libraries/libxml2/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index c359ea10b665..36606999f534 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -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. diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 04b044bc6ccc..a4d6290ab4e3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -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; |