From 11307c1d474523c3a901fc7d9d7de52bf93d4671 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Fri, 21 May 2021 07:03:49 +0200 Subject: [PATCH] maturinBuildHook: add rustc to deps maturin 0.10.5 uses rustc -vV to find the host: https://github.com/PyO3/maturin/commit/e886c85f5a422111f7447541fd896228f6d403f1 We now need to make rustc visible to the hook for maturin to work properly. --- pkgs/build-support/rust/hooks/default.nix | 3 ++- pkgs/development/compilers/rust/make-rust-platform.nix | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/rust/hooks/default.nix b/pkgs/build-support/rust/hooks/default.nix index e8927e2b542..d86c9ebaed8 100644 --- a/pkgs/build-support/rust/hooks/default.nix +++ b/pkgs/build-support/rust/hooks/default.nix @@ -6,6 +6,7 @@ , makeSetupHook , maturin , rust +, rustc , stdenv , target ? rust.toRustTargetSpec stdenv.hostPlatform }: @@ -85,7 +86,7 @@ in { maturinBuildHook = callPackage ({ }: makeSetupHook { name = "maturin-build-hook.sh"; - deps = [ cargo maturin ]; + deps = [ cargo maturin rustc ]; substitutions = { inherit ccForBuild ccForHost cxxForBuild cxxForHost rustBuildPlatform rustTargetPlatform rustTargetPlatformSpec; diff --git a/pkgs/development/compilers/rust/make-rust-platform.nix b/pkgs/development/compilers/rust/make-rust-platform.nix index 584b1fdbe43..367da3c738d 100644 --- a/pkgs/development/compilers/rust/make-rust-platform.nix +++ b/pkgs/development/compilers/rust/make-rust-platform.nix @@ -26,6 +26,6 @@ rec { # Hooks inherit (callPackage ../../../build-support/rust/hooks { - inherit cargo; + inherit cargo rustc; }) cargoBuildHook cargoCheckHook cargoInstallHook cargoSetupHook maturinBuildHook; }