libxml2Python: Darwin builds require libintl (better fix)
This commit is contained in:
parent
ef3cb36ba4
commit
6a359b2333
2 changed files with 4 additions and 4 deletions
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, lib, fetchurl, fetchpatch
|
||||
, zlib, xz, python, gettext, ncurses, findXMLCatalogs
|
||||
, zlib, xz, libintl, python, gettext, ncurses, findXMLCatalogs
|
||||
, pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform
|
||||
, icuSupport ? false, icu ? null
|
||||
, enableShared ? stdenv.hostPlatform.libc != "msvcrt"
|
||||
|
@ -46,6 +46,8 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = lib.optional pythonSupport python
|
||||
++ lib.optional (pythonSupport && python?isPy2 && python.isPy2) gettext
|
||||
++ lib.optional (pythonSupport && python?isPy3 && python.isPy3) ncurses
|
||||
++ lib.optional (stdenv.isDarwin &&
|
||||
pythonSupport && python?isPy2 && python.isPy2) libintl
|
||||
# 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.
|
||||
|
|
|
@ -13904,9 +13904,7 @@ in
|
|||
python = python3;
|
||||
};
|
||||
|
||||
libxml2Python = let
|
||||
libxml2 = python2Packages.libxml2;
|
||||
in pkgs.buildEnv { # slightly hacky
|
||||
libxml2Python = pkgs.buildEnv { # slightly hacky
|
||||
name = "libxml2+py-${res.libxml2.version}";
|
||||
paths = with libxml2; [ dev bin py ];
|
||||
inherit (libxml2) passthru;
|
||||
|
|
Loading…
Reference in a new issue