setuptools-rust-hook: Use correct python for cross

NixOS · Dec 18, 2023 · bf46f5e · bf46f5e
1 parent ec58a9e
commit bf46f5e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix
@@ -188,7 +188,9 @@ in {
         name = "setuptools-rust-setup-hook";
         propagatedBuildInputs = [ setuptools-rust ];
         substitutions = {
+          pyIncludeDir = "${python}/include/${python.libPrefix}";
           pyLibDir = "${python}/lib/${python.libPrefix}";
+          pyBin = python.interpreter;
           cargoBuildTarget = stdenv.hostPlatform.rust.rustcTargetSpec;
           cargoLinkerVar = stdenv.hostPlatform.rust.cargoEnvVarTarget;
           targetLinker = "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc";

diff --git a/pkgs/development/interpreters/python/hooks/setuptools-rust-hook.sh b/pkgs/development/interpreters/python/hooks/setuptools-rust-hook.sh
@@ -7,7 +7,9 @@ setuptoolsRustSetup() {
         exit 1
     fi
 
-    export PYO3_CROSS_LIB_DIR="@pyLibDir@"
+    export PYO3_CROSS_INCLUDE_DIR="@pyIncludeDir@";
+    export PYO3_CROSS_LIB_DIR="@pyLibDir@";
+    export PYO3_PYTHON="@pyBin@";
     export CARGO_BUILD_TARGET=@cargoBuildTarget@
     # TODO theoretically setting linker should not be required because it is
     # already set in pkgs/build-support/rust/hooks/default.nix but build fails