Merge remote-tracking branch 'origin/master'
1 file changed, 12 insertions(+), 6 deletions(-)
changed files
M modules/development/javascript.nix → modules/development/javascript.nix
@@ -2,8 +2,6 @@ { config, pkgs, ... }: { environment.systemPackages = with pkgs.unstable; [ nodejs-8_x - phantomjs2 - yarn nodePackages.tern nodePackages.node2nix@@ -11,13 +9,21 @@ nodePackages.nodemon nodePackages.javascript-typescript-langserver nodePackages.eslint_d + nodePackages.node-gyp + nodePackages.node-gyp-build + nodePackages.node-pre-gyp + ] ++ ( + if stdenv.isDarwin + then + [ + ] + else + [ # npm install may use any of these binutils gcc gnumake python2 - nodePackages.node-gyp - nodePackages.node-gyp-build - nodePackages.node-pre-gyp - ]; + ] + ); }