From b7155460719ba2c8b0b276fad3fdd22441eac9f9 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 16 Jul 2015 14:35:31 +0000
Subject: Make fetchBower a bit more like a normal mkDerivation, which is
 easier to test. Also, in some cases, the result of fetchBower is different
 depending on the value of $out. For now, it seems that it works best if using
 a local output directory before copying to $out.

(cherry picked from commit aa4c6b027163abe0891f9ad438899f9679298a64)
---
 pkgs/build-support/fetchbower/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'pkgs/build-support')

diff --git a/pkgs/build-support/fetchbower/default.nix b/pkgs/build-support/fetchbower/default.nix
index 11af6dbedf1..7c6b1a8a098 100644
--- a/pkgs/build-support/fetchbower/default.nix
+++ b/pkgs/build-support/fetchbower/default.nix
@@ -1,9 +1,11 @@
 { stdenv, fetch-bower, git }: name: version: target: outputHash: stdenv.mkDerivation {
   name = "${name}-${version}";
-  realBuilder = "${fetch-bower}/bin/fetch-bower";
-  args = [ name version target ];
+  buildCommand = ''
+    out=$PWD/out fetch-bower ${name} ${version} ${target}
+    cp -R out $out
+  '';
   outputHashMode = "recursive";
   outputHashAlgo = "sha256";
   inherit outputHash;
-  PATH = "${git}/bin";
+  buildInputs = [git fetch-bower];
 }
-- 
cgit 1.4.1