public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rustc-bootstrap: Use optionalString.

Browse Source
This commit is contained in:
Moritz Ulrich 2016-08-09 08:23:27 +02:00
parent 86326cbf54
commit 3324123eb7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/compilers/rust/bootstrap.nix
View File

@ -50,11 +50,11 @@ rec {
./install.sh --prefix=$out \ ./install.sh --prefix=$out \
--components=rustc,rust-std-${platform},rust-docs --components=rustc,rust-std-${platform},rust-docs
${if needsPatchelf then '' ${optionalString needsPatchelf ''
patchelf \ patchelf \
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
"$out/bin/rustc" "$out/bin/rustc"
'' else ""} ''}
# Do NOT, I repeat, DO NOT use `wrapProgram` on $out/bin/rustc # Do NOT, I repeat, DO NOT use `wrapProgram` on $out/bin/rustc
# (or similar) here. It causes strange effects where rustc loads # (or similar) here. It causes strange effects where rustc loads
@ -77,11 +77,11 @@ rec {
./install.sh --prefix=$out \ ./install.sh --prefix=$out \
--components=cargo --components=cargo
${if needsPatchelf then '' ${optionalString needsPatchelf ''
patchelf \ patchelf \
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
"$out/bin/cargo" "$out/bin/cargo"
'' else ""} ''}
wrapProgram "$out/bin/cargo" \ wrapProgram "$out/bin/cargo" \
--suffix PATH : "${rustc}/bin" --suffix PATH : "${rustc}/bin"