From 952c477f901f35a99758bcc8fdf8b685ad8fa3e0 Mon Sep 17 00:00:00 2001
From: Rodney Lorrimar <dev@rodney.id.au>
Date: Thu, 15 Sep 2016 00:51:56 +0100
Subject: nodePackages.bower2nix: Add back PATH wrapping

bower2nix and fetch-bower need git in the PATH to operate. This wrapping
got lost with the nodePackages updates.

(Fixes #18454)
---
 pkgs/development/node-packages/default-v4.nix | 9 +++++++++
 pkgs/development/node-packages/default-v5.nix | 9 +++++++++
 pkgs/development/node-packages/default-v6.nix | 9 +++++++++
 3 files changed, 27 insertions(+)

(limited to 'pkgs/development/node-packages')

diff --git a/pkgs/development/node-packages/default-v4.nix b/pkgs/development/node-packages/default-v4.nix
index be5a0abc4fca..99cb7ca40441 100644
--- a/pkgs/development/node-packages/default-v4.nix
+++ b/pkgs/development/node-packages/default-v4.nix
@@ -38,4 +38,13 @@ nodePackages // {
   npm2nix = nodePackages."npm2nix-git://github.com/NixOS/npm2nix.git#5.12.0".override {
     postInstall = "npm run-script prepublish";
   };
+
+  bower2nix = nodePackages.bower2nix.override (oldAttrs: {
+    buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ];
+    postInstall = ''
+      for prog in bower2nix fetch-bower; do
+        wrapProgram "$out/bin/$prog" --prefix PATH : "${pkgs.git}/bin"
+      done
+    '';
+  });
 }
diff --git a/pkgs/development/node-packages/default-v5.nix b/pkgs/development/node-packages/default-v5.nix
index c858c580d2a4..00dce5966aae 100644
--- a/pkgs/development/node-packages/default-v5.nix
+++ b/pkgs/development/node-packages/default-v5.nix
@@ -32,4 +32,13 @@ nodePackages // {
     
     dontNpmInstall = true; # We face an error with underscore not found, but the package will work fine if we ignore this.
   });
+
+  bower2nix = nodePackages.bower2nix.override (oldAttrs: {
+    buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ];
+    postInstall = ''
+      for prog in bower2nix fetch-bower; do
+        wrapProgram "$out/bin/$prog" --prefix PATH : "${pkgs.git}/bin"
+      done
+    '';
+  });
 }
diff --git a/pkgs/development/node-packages/default-v6.nix b/pkgs/development/node-packages/default-v6.nix
index c858c580d2a4..00dce5966aae 100644
--- a/pkgs/development/node-packages/default-v6.nix
+++ b/pkgs/development/node-packages/default-v6.nix
@@ -32,4 +32,13 @@ nodePackages // {
     
     dontNpmInstall = true; # We face an error with underscore not found, but the package will work fine if we ignore this.
   });
+
+  bower2nix = nodePackages.bower2nix.override (oldAttrs: {
+    buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ];
+    postInstall = ''
+      for prog in bower2nix fetch-bower; do
+        wrapProgram "$out/bin/$prog" --prefix PATH : "${pkgs.git}/bin"
+      done
+    '';
+  });
 }
-- 
cgit 1.4.1