From 7ddb7fe62c290c554d6280178ba86ebe811987fc Mon Sep 17 00:00:00 2001 From: Alois Wohlschlager Date: Sat, 2 Aug 2025 18:13:07 +0200 Subject: lixPackageSets.*.lix: use buildPackages.python3 instead of python3.pythonOnBuildForHost The former seems to exhibit fewer subtle issues breaking cross (in particular static) builds, for reasons I have not yet understood. (cherry picked from commit cf6821c8f84fe12f6e6120bcad28295ae2d9f291) --- pkgs/tools/package-management/lix/common-lix.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/lix/common-lix.nix b/pkgs/tools/package-management/lix/common-lix.nix index 1baecc3d7be4..0b54e7fc615f 100644 --- a/pkgs/tools/package-management/lix/common-lix.nix +++ b/pkgs/tools/package-management/lix/common-lix.nix @@ -57,7 +57,7 @@ assert lib.assertMsg ( rustc, toml11, pegtl, - python3, + buildPackages, pkg-config, rapidcheck, sqlite, @@ -136,7 +136,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ # python3.withPackages does not splice properly, see https://github.com/NixOS/nixpkgs/issues/305858 - (python3.pythonOnBuildForHost.withPackages ( + (buildPackages.python3.withPackages ( p: [ p.python-frontmatter @@ -153,7 +153,6 @@ stdenv.mkDerivation (finalAttrs: { meson ninja cmake - python3 # Required for libstd++ assertions that leaks inside of the final binary. removeReferencesTo -- cgit v1.2.3