libxml2: get rid of generic arguments
This commit is contained in:
@@ -1,11 +1,12 @@
|
||||
{
|
||||
stdenv,
|
||||
darwin,
|
||||
lib,
|
||||
fetchFromGitLab,
|
||||
pkg-config,
|
||||
autoreconfHook,
|
||||
libintl,
|
||||
python,
|
||||
python3,
|
||||
gettext,
|
||||
ncurses,
|
||||
findXMLCatalogs,
|
||||
@@ -31,7 +32,13 @@
|
||||
enableHttp ? false,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
let
|
||||
python = python3;
|
||||
# libxml2 is a dependency of xcbuild. Avoid an infinite recursion by using a bootstrap stdenv
|
||||
# that does not propagate xcrun.
|
||||
stdenv' = if stdenv.hostPlatform.isDarwin then darwin.bootstrapStdenv else stdenv;
|
||||
in
|
||||
stdenv'.mkDerivation (finalAttrs: {
|
||||
pname = "libxml2";
|
||||
version = "2.14.5";
|
||||
|
||||
|
||||
@@ -8835,13 +8835,7 @@ with pkgs;
|
||||
libxcrypt-legacy = libxcrypt.override { enableHashes = "all"; };
|
||||
|
||||
libxkbcommon = libxkbcommon_8;
|
||||
libxml2 = callPackage ../development/libraries/libxml2 {
|
||||
python = python3;
|
||||
stdenv =
|
||||
# libxml2 is a dependency of xcbuild. Avoid an infinite recursion by using a bootstrap stdenv
|
||||
# that does not propagate xcrun.
|
||||
if stdenv.hostPlatform.isDarwin then darwin.bootstrapStdenv else stdenv;
|
||||
};
|
||||
libxml2 = callPackage ../development/libraries/libxml2 { };
|
||||
|
||||
libxml2Python =
|
||||
let
|
||||
|
||||
@@ -8234,7 +8234,7 @@ self: super: with self; {
|
||||
(toPythonModule (
|
||||
pkgs.libxml2.override {
|
||||
pythonSupport = true;
|
||||
inherit python;
|
||||
python3 = python;
|
||||
}
|
||||
)).py;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user