From f6669da3cfcf328e573b5be9dde56a638c3a0c95 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Fri, 24 Mar 2017 08:40:16 +0100
Subject: [PATCH] fetchrepoproject: fix evaluation

---
 pkgs/build-support/fetchrepoproject/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/build-support/fetchrepoproject/default.nix b/pkgs/build-support/fetchrepoproject/default.nix
index f0bc02cf66df..01d7fe1d0f55 100644
--- a/pkgs/build-support/fetchrepoproject/default.nix
+++ b/pkgs/build-support/fetchrepoproject/default.nix
@@ -15,11 +15,10 @@ stdenv.mkDerivation {
     done
 
     export HOME=.repo
-    repo init --manifest-url=${manifest} --manifest-branch=${rev} --depth=1 --no-clone-bundle''
-  + ${optionalString (repoRepoURL != "") " --repo-url=${repoRepoURL}"}
-  + ${optionalString (repoRepoRev != "") " --repo-branch=${repoRepoRev}"}
-  + ${optionalString (referenceDir != "") " --reference=${referenceDir}"}
-  + ''
+    repo init --manifest-url=${manifest} --manifest-branch=${rev} --depth=1 --no-clone-bundle
+    ${optionalString (repoRepoURL != "") " --repo-url=${repoRepoURL}"}
+    ${optionalString (repoRepoRev != "") " --repo-branch=${repoRepoRev}"}
+    ${optionalString (referenceDir != "") " --reference=${referenceDir}"}
     repo sync --jobs=$NIX_BUILD_CORES --current-branch
     rm -rf $out/.repo
   '';