diff options
| author | Daniël de Kok <me@danieldk.eu> | 2021-05-21 07:03:49 +0200 |
|---|---|---|
| committer | Daniël de Kok <me@danieldk.eu> | 2021-05-21 07:51:27 +0200 |
| commit | 11307c1d474523c3a901fc7d9d7de52bf93d4671 (patch) | |
| tree | 8bc8e9bc4e51a6bcdf2d0a0037a7b2cdf0d7d3fa /pkgs/build-support/rust | |
| parent | aef81404bcc8627eb493157ecc51e9708fd14ad5 (diff) | |
| download | nixpkgs-11307c1d474523c3a901fc7d9d7de52bf93d4671.tar nixpkgs-11307c1d474523c3a901fc7d9d7de52bf93d4671.tar.gz nixpkgs-11307c1d474523c3a901fc7d9d7de52bf93d4671.tar.bz2 nixpkgs-11307c1d474523c3a901fc7d9d7de52bf93d4671.tar.lz nixpkgs-11307c1d474523c3a901fc7d9d7de52bf93d4671.tar.xz nixpkgs-11307c1d474523c3a901fc7d9d7de52bf93d4671.tar.zst nixpkgs-11307c1d474523c3a901fc7d9d7de52bf93d4671.zip | |
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.
Diffstat (limited to 'pkgs/build-support/rust')
| -rw-r--r-- | pkgs/build-support/rust/hooks/default.nix | 3 |
1 files changed, 2 insertions, 1 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; |