colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bower2nix: fix execution under nix-shell --pure

Browse Source 
bower2nix needs nix to compute store hashes.

Fixes rvl/bower2nix#16
This commit is contained in:
Rodney Lorrimar 2017-10-30 12:16:48 +00:00 committed by Domen Kožar
parent 9b0d50e3d0
commit 9ec640ec70
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/node-packages/default-v4.nix
View File

@ -1,4 +1,4 @@
{pkgs, system, nodejs}:
{pkgs, system, nodejs, stdenv}:
let
nodePackages = import ./composition-v4.nix {
@ -43,7 +43,7 @@ nodePackages // {
buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ];
postInstall = ''
for prog in bower2nix fetch-bower; do
wrapProgram "$out/bin/$prog" --prefix PATH : "${pkgs.git}/bin"
wrapProgram "$out/bin/$prog" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.git pkgs.nix ]}
done
'';
});

4
pkgs/development/node-packages/default-v6.nix
View File

@ -1,4 +1,4 @@
{pkgs, system, nodejs}:
{pkgs, system, nodejs, stdenv}:
let
nodePackages = import ./composition-v6.nix {
@ -41,7 +41,7 @@ nodePackages // {
buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ];
postInstall = ''
for prog in bower2nix fetch-bower; do
wrapProgram "$out/bin/$prog" --prefix PATH : "${pkgs.git}/bin"
wrapProgram "$out/bin/$prog" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.git pkgs.nix ]}
done
'';
});

2
pkgs/top-level/node-packages.nix
View File

@ -66,7 +66,7 @@ in rec {
bower2nix.buildInputs = [ pkgs.makeWrapper ];
bower2nix.postInstall = ''
for prog in bower2nix fetch-bower; do
wrapProgram "$out/bin/$prog" --prefix PATH : "${pkgs.git}/bin"
wrapProgram "$out/bin/$prog" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.git pkgs.nix ]}
done
'';
} // args.overrides or {};