From 3324123eb7e4ee9cab9b53c9655971430f59ec2b Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Tue, 9 Aug 2016 08:23:27 +0200
Subject: rustc-bootstrap: Use optionalString.

---
 pkgs/development/compilers/rust/bootstrap.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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