diff options
Diffstat (limited to 'nixpkgs/pkgs/development/tools/rust/rustup/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/tools/rust/rustup/default.nix | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/development/tools/rust/rustup/default.nix b/nixpkgs/pkgs/development/tools/rust/rustup/default.nix index e5874580d3f9..3f08882e1fbe 100644 --- a/nixpkgs/pkgs/development/tools/rust/rustup/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/rustup/default.nix @@ -48,7 +48,12 @@ rustPlatform.buildRustPackage rec { checkFeatures = [ ]; patches = lib.optionals stdenv.isLinux [ - (runCommand "0001-dynamically-patchelf-binaries.patch" { CC = stdenv.cc; patchelf = patchelf; libPath = "$ORIGIN/../lib:${libPath}"; } '' + (runCommand "0001-dynamically-patchelf-binaries.patch" + { + CC = stdenv.cc; + patchelf = patchelf; + libPath = "${libPath}"; + } '' export dynamicLinker=$(cat $CC/nix-support/dynamic-linker) substitute ${./0001-dynamically-patchelf-binaries.patch} $out \ --subst-var patchelf \ @@ -96,10 +101,25 @@ rustPlatform.buildRustPackage rec { # Note: fish completion script is not supported. $out/bin/rustup completions bash cargo > "$out/share/bash-completion/completions/cargo" $out/bin/rustup completions zsh cargo > "$out/share/zsh/site-functions/_cargo" + + # add a wrapper script for ld.lld + mkdir -p $out/nix-support + substituteAll ${../../../../../pkgs/build-support/wrapper-common/utils.bash} $out/nix-support/utils.bash + substituteAll ${../../../../../pkgs/build-support/bintools-wrapper/add-flags.sh} $out/nix-support/add-flags.sh + substituteAll ${../../../../../pkgs/build-support/bintools-wrapper/add-hardening.sh} $out/nix-support/add-hardening.sh + export prog='$PROG' + export use_response_file_by_default=0 + substituteAll ${../../../../../pkgs/build-support/bintools-wrapper/ld-wrapper.sh} $out/nix-support/ld-wrapper.sh + chmod +x $out/nix-support/ld-wrapper.sh ''; + env = lib.optionalAttrs (pname == "rustup") { + inherit (stdenv.cc.bintools) expandResponseParams shell suffixSalt wrapperName coreutils_bin; + hardening_unsupported_flags = ""; + }; + meta = with lib; { - description = "The Rust toolchain installer"; + description = "Rust toolchain installer"; homepage = "https://www.rustup.rs/"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = [ maintainers.mic92 ]; |