diff options
| author | Sander van der Burg <svanderburg@gmail.com> | 2018-04-15 22:39:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-15 22:39:34 +0200 |
| commit | fc7c95b0aa4e0e798ff3d5234020d88a64f49032 (patch) | |
| tree | a7762a28cccc8fe77d9370fc20f18bb423ecb202 /pkgs | |
| parent | 59cf37fd6f697d0126e4a4b78979008d8d864bf4 (diff) | |
| parent | 5bb75e17b9dc7cfb3d1bc4751642954485155ae1 (diff) | |
| download | nixpkgs-fc7c95b0aa4e0e798ff3d5234020d88a64f49032.tar nixpkgs-fc7c95b0aa4e0e798ff3d5234020d88a64f49032.tar.gz nixpkgs-fc7c95b0aa4e0e798ff3d5234020d88a64f49032.tar.bz2 nixpkgs-fc7c95b0aa4e0e798ff3d5234020d88a64f49032.tar.lz nixpkgs-fc7c95b0aa4e0e798ff3d5234020d88a64f49032.tar.xz nixpkgs-fc7c95b0aa4e0e798ff3d5234020d88a64f49032.tar.zst nixpkgs-fc7c95b0aa4e0e798ff3d5234020d88a64f49032.zip | |
Merge pull request #38947 from srghma/node2nix-fix
node2nix: add nix as dependency (fix for #38946)
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/node-packages/default-v6.nix | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/pkgs/development/node-packages/default-v6.nix b/pkgs/development/node-packages/default-v6.nix index 5fc007bbfd0..2be09eb1632 100644 --- a/pkgs/development/node-packages/default-v6.nix +++ b/pkgs/development/node-packages/default-v6.nix @@ -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 ]} + ''; + }); } |