b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #38947 from srghma/node2nix-fix

Browse source 
node2nix: add nix as dependency (fix for #38946)
This commit is contained in:
Sander van der Burg 2018-04-15 22:39:34 +02:00 committed by GitHub
parent 59cf37fd6f 5bb75e17b9
commit fc7c95b0aa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/development/node-packages/default-v6.nix
View file

@ -24,13 +24,13 @@ nodePackages // {
phantomjs = nodePackages.phantomjs.override (oldAttrs: {
buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs2 ];
});
webdrvr = nodePackages.webdrvr.override (oldAttrs: {
buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs ];
preRebuild = ''
mkdir $TMPDIR/webdrvr
ln -s ${pkgs.fetchurl {
url = "https://selenium-release.storage.googleapis.com/2.43/selenium-server-standalone-2.43.1.jar";
sha1 = "ef1b5f8ae9c99332f99ba8794988a1d5b974d27b";
@ -72,4 +72,11 @@ nodePackages // {
'';
buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs2 ];
});
node2nix = nodePackages.node2nix.override (oldAttrs: {
buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ];
postInstall = ''
wrapProgram "$out/bin/node2nix" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.nix ]}
'';
});
}