libxml2: get rid of generic arguments

This commit is contained in:
Gutyina Gergő
2025-07-19 00:28:01 +02:00
parent 0ac23e27dd
commit 037387d4ba
3 changed files with 11 additions and 10 deletions
@@ -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";
+1 -7
View File
@@ -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
+1 -1
View File
@@ -8234,7 +8234,7 @@ self: super: with self; {
(toPythonModule (
pkgs.libxml2.override {
pythonSupport = true;
inherit python;
python3 = python;
}
)).py;