diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 9ea7dc6c9d53..5e290b25832d 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, 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. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index abba2623a575..94204a91d1c2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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;