Merge commit '83cbad92d73216bb0d9187c56cce0b91f9121d5a' into main

1 files changed, 10 insertions, 4 deletions

diff --git a/infra/libkookie/nixpkgs/pkgs/development/libraries/talloc/default.nix b/infra/libkookie/nixpkgs/pkgs/development/libraries/talloc/default.nix
index f464364e8a0a..fa920d037a92 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/libraries/talloc/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/libraries/talloc/default.nix
@@ -1,6 +1,6 @@
 { stdenv
 , fetchurl
-, python
+, python3
 , pkg-config
 , readline
 , libxslt
@@ -10,7 +10,7 @@
 , wafHook
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (rec {
   pname = "talloc";
   version = "2.3.1";
 
@@ -22,13 +22,14 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     pkg-config
     fixDarwinDylibNames
-    python
+    python3
     wafHook
     docbook-xsl-nons
     docbook_xml_dtd_42
   ];
 
   buildInputs = [
+    python3
     readline
     libxslt
   ];
@@ -56,4 +57,9 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3;
     platforms = platforms.all;
   };
-}
+} // stdenv.lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) {
+  # python-config from build Python gives incorrect values when cross-compiling.
+  # If python-config is not found, the build falls back to using the sysconfig
+  # module, which works correctly when cross-compiling.
+  PYTHON_CONFIG = "/invalid";
+})