From f7bf69cf5141a8193b900a136f18769bd0820d00 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Fri, 5 Jul 2019 16:09:41 +0200
Subject: javascript: split npmPackages

---
 modules/development/javascript.nix | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

(limited to 'modules/development/javascript.nix')

diff --git a/modules/development/javascript.nix b/modules/development/javascript.nix
index 67eef97..df1da10 100644
--- a/modules/development/javascript.nix
+++ b/modules/development/javascript.nix
@@ -4,23 +4,8 @@ let
   node = pkgs.unstable.nodejs-10_x;
   npmPackages = pkgs.unstable.nodePackages_10_x;
 in
-{ environment.systemPackages = with pkgs.unstable; [
+{ environment.systemPackages = (with pkgs.unstable; [
     node
-
-    npmPackages.node-gyp
-    npmPackages.node-gyp-build
-    npmPackages.node-pre-gyp
-
-    npmPackages.tern
-    npmPackages.node2nix
-    npmPackages.nodemon
-    npmPackages.javascript-typescript-langserver
-    npmPackages.typescript-language-server
-    npmPackages.eslint_d
-    npmPackages.yarn
-    npmPackages.prettier
-    npmPackages.pnpm
-
   ] ++ (
     if stdenv.isDarwin
     then
@@ -34,5 +19,19 @@ in
     gnumake
     python2
     ]
-  );
+  )) ++ (with npmPackages; [
+    node-gyp
+    node-gyp-build
+    node-pre-gyp
+
+    tern
+    node2nix
+    nodemon
+    javascript-typescript-langserver
+    typescript-language-server
+    eslint_d
+    yarn
+    prettier
+    pnpm
+  ]);
 }
-- 
cgit 1.4.1