From 086e0f60c01730cacd716f14115bef99774f6957 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Sun, 21 Oct 2018 14:55:27 +0200 Subject: Setup trillian (MacBook) --- modules/development/javascript.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'modules/development/javascript.nix') diff --git a/modules/development/javascript.nix b/modules/development/javascript.nix index 1d25ae8..37b7865 100644 --- a/modules/development/javascript.nix +++ b/modules/development/javascript.nix @@ -2,8 +2,6 @@ { environment.systemPackages = with pkgs.unstable; [ nodejs-8_x - phantomjs2 - yarn nodePackages.tern nodePackages.node2nix @@ -11,13 +9,21 @@ 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 - ]; + ] + ); } -- cgit 1.4.1