From 83b39bc89a5698ba7842ea9de6621817d1d894ca Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Fri, 7 Sep 2018 17:08:36 +0200
Subject: Import more packages for imperative user installs

---
 modules/development/base.nix       | 1 +
 modules/development/javascript.nix | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'modules/development')

diff --git a/modules/development/base.nix b/modules/development/base.nix
index e8d2b76..d2d67db 100644
--- a/modules/development/base.nix
+++ b/modules/development/base.nix
@@ -8,6 +8,7 @@
 
     editorconfig-core-c
     multimarkdown
+    go
     gocode
 
     surf
diff --git a/modules/development/javascript.nix b/modules/development/javascript.nix
index 2e92509..c882860 100644
--- a/modules/development/javascript.nix
+++ b/modules/development/javascript.nix
@@ -4,12 +4,17 @@
     nodejs-8_x
     phantomjs2
     yarn
+
     nodePackages.tern
     nodePackages.node2nix
     nodePackages.nodemon
     nodePackages.javascript-typescript-langserver
     nodePackages.eslint_d
+
+    # npm install may use any of these
+    python2
     nodePackages.node-gyp
-    gnumake
+    nodePackages.node-gyp-build
+    nodePackages.node-pre-gyp
   ];
 }
-- 
cgit 1.4.1