diff options
Diffstat (limited to 'pkgs/development/compilers/rust')
-rw-r--r-- | pkgs/development/compilers/rust/cargo-auditable.nix | 5 | ||||
-rw-r--r-- | pkgs/development/compilers/rust/rustc.nix | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/development/compilers/rust/cargo-auditable.nix b/pkgs/development/compilers/rust/cargo-auditable.nix index 1cf765b35100d..0b3b6a4ede982 100644 --- a/pkgs/development/compilers/rust/cargo-auditable.nix +++ b/pkgs/development/compilers/rust/cargo-auditable.nix @@ -22,11 +22,6 @@ let cargoHash = "sha256-4o3ctun/8VcBRuj+j0Yaawdkyn6Z6LPp+FTyhPxQWU8="; - # Cargo.lock is outdated - preConfigure = '' - cargo update --offline - ''; - meta = with lib; { description = "A tool to make production Rust binaries auditable"; mainProgram = "cargo-auditable"; diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 4c02692b75bd5..254732ed26035 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -192,6 +192,12 @@ in stdenv.mkDerivation (finalAttrs: { postPatch = '' patchShebangs src/etc + # rust-lld is the name rustup uses for its bundled lld, so that it + # doesn't conflict with any system lld. This is not an + # appropriate default for Nixpkgs, where there is no rust-lld. + substituteInPlace compiler/rustc_target/src/spec/*/*.rs \ + --replace-quiet '"rust-lld"' '"lld"' + ${optionalString (!withBundledLLVM) "rm -rf src/llvm"} # Useful debugging parameter |