From 2078c34dad8ecdb8955572e2662ecb4eef750d70 Mon Sep 17 00:00:00 2001
From: Sophie Taylor <sophie@spacekitteh.moe>
Date: Fri, 24 Mar 2017 18:27:18 +1000
Subject: fetchRepoProject: Fix buildCommand

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

(limited to 'pkgs/build-support')

diff --git a/pkgs/build-support/fetchrepoproject/default.nix b/pkgs/build-support/fetchrepoproject/default.nix
index 01d7fe1d0f55..33adb5ab1dd4 100644
--- a/pkgs/build-support/fetchrepoproject/default.nix
+++ b/pkgs/build-support/fetchrepoproject/default.nix
@@ -15,10 +15,11 @@ 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
   '';
-- 
cgit 1.4.1


From 00f472a563c030d0232bfd39af8b3f5411169a5d Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sat, 25 Mar 2017 00:35:20 +0100
Subject: fetchrepoproject: cleanup extra flags

---
 pkgs/build-support/fetchrepoproject/default.nix | 31 ++++++++++++++++---------
 1 file changed, 20 insertions(+), 11 deletions(-)

(limited to 'pkgs/build-support')

diff --git a/pkgs/build-support/fetchrepoproject/default.nix b/pkgs/build-support/fetchrepoproject/default.nix
index 33adb5ab1dd4..78a46d4ac9bd 100644
--- a/pkgs/build-support/fetchrepoproject/default.nix
+++ b/pkgs/build-support/fetchrepoproject/default.nix
@@ -1,25 +1,34 @@
-{stdenv, git, gitRepo, gnupg ? null, cacert}:
+{ stdenv, git, gitRepo, gnupg ? null, cacert }:
 
-{name, manifest, rev ? "HEAD", sha256 ? "", repoRepoURL ? "", repoRepoRev ? "", referenceDir ? "",
-localManifests ? [] }:
+{ name, manifest, rev ? "HEAD", sha256 ? "", repoRepoURL ? "", repoRepoRev ? "", referenceDir ? ""
+, localManifests ? []
+}:
 
 assert repoRepoRev != "" -> repoRepoURL != "";
 
+with stdenv.lib;
+
+let
+  extraRepoInitFlags = [
+    (optionalString (repoRepoURL != "") "--repo-url=${repoRepoURL}")
+    (optionalString (repoRepoRev != "") "--repo-branch=${repoRepoRev}")
+    (optionalString (referenceDir != "") "--reference=${referenceDir}")
+  ];
+in
+
 stdenv.mkDerivation {
-  buildCommand = with stdenv.lib; ''
+  buildCommand = ''
     mkdir ./.repo
     mkdir ./.repo/local_manifests
-    for local_manifest in ${concatMapStringsSep " " (x: "${x}") localManifests}
+    for local_manifest in ${concatMapStringsSep " " toString localManifests}
     do
       cp $local_manifest ./.repo/local_manifests/$(stripHash $local_manifest; echo $strippedName)
     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 \
+        ${concatStringsSep " " extraRepoInitFlags}
+
     repo sync --jobs=$NIX_BUILD_CORES --current-branch
     rm -rf $out/.repo
   '';
@@ -30,7 +39,7 @@ stdenv.mkDerivation {
     "GIT_PROXY_COMMAND" "SOCKS_SERVER"
   ];
 
-  buildInputs = [git gitRepo cacert] ++ stdenv.lib.optional (gnupg != null) [gnupg] ;
+  buildInputs = [git gitRepo cacert] ++ optional (gnupg != null) [gnupg] ;
 
   outputHashAlgo = "sha256";
   outputHashMode = "recursive";
-- 
cgit 1.4.1