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

libxml2Python: Darwin builds require libintl (better fix)

Browse Source
This commit is contained in:
John Wiegley 2020-06-24 08:20:13 -07:00
parent ef3cb36ba4
commit 6a359b2333
No known key found for this signature in database
GPG Key ID: C144D8F4F19FE630
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, fetchpatch { stdenv, lib, fetchurl, fetchpatch
, zlib, xz, python, gettext, ncurses, findXMLCatalogs , zlib, xz, libintl, python, gettext, 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"
@ -46,6 +46,8 @@ stdenv.mkDerivation rec {
buildInputs = lib.optional pythonSupport python buildInputs = lib.optional pythonSupport python
++ lib.optional (pythonSupport && python?isPy2 && python.isPy2) gettext ++ lib.optional (pythonSupport && python?isPy2 && python.isPy2) gettext
++ lib.optional (pythonSupport && python?isPy3 && python.isPy3) ncurses ++ 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 # 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.

4
pkgs/top-level/all-packages.nix
View File

@ -13904,9 +13904,7 @@ in
python = python3; python = python3;
}; };
libxml2Python = let libxml2Python = pkgs.buildEnv { # slightly hacky
libxml2 = python2Packages.libxml2;
in pkgs.buildEnv { # slightly hacky
name = "libxml2+py-${res.libxml2.version}"; name = "libxml2+py-${res.libxml2.version}";
paths = with libxml2; [ dev bin py ]; paths = with libxml2; [ dev bin py ];
inherit (libxml2) passthru; inherit (libxml2) passthru;