From 9e0eb58032bcb3db9e37b3b0755f84e5fa902d51 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 10 Apr 2024 23:07:04 +0200 Subject: rustc: build rustdoc even when cross compiling rustdoc is built for native builds, because it's used to run doctests, but it wasn't built for cross builds, since they don't run doctests. This inconsistency led to wrapRustc not working for cross-compiled rustc, because it expected there to be a rustdoc binary. In the interests of consistency, let's instruct the build system to always build rustdoc. Link: https://github.com/NixOS/nixpkgs/pull/292777#issuecomment-2048071969 Fixes: 6f8fa05acf5e ("wrapRustc: wrap rustdoc") --- pkgs/development/compilers/rust/rustc.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/compilers/rust') diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 0a4a351b1cfda..ee4ee37dfc98b 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -93,7 +93,7 @@ in stdenv.mkDerivation (finalAttrs: { # attempts to download the missing source tarball "--set=build.rustfmt=${rustfmt}/bin/rustfmt" ] ++ [ - "--tools=rustc,rust-analyzer-proc-macro-srv" + "--tools=rustc,rustdoc,rust-analyzer-proc-macro-srv" "--enable-rpath" "--enable-vendor" "--build=${stdenv.buildPlatform.rust.rustcTargetSpec}" -- cgit 1.4.1