From c978f917ebf52d76beac40eacdaed815f329615b Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Fri, 13 Dec 2019 15:15:19 +0100
Subject: Add node2nix packages as overlay

---
 user/overlays/extra-packages.nix | 3 +++
 user/settings/javascript.nix     | 7 ++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/user/overlays/extra-packages.nix b/user/overlays/extra-packages.nix
index fd0ed00e..552349f4 100644
--- a/user/overlays/extra-packages.nix
+++ b/user/overlays/extra-packages.nix
@@ -4,4 +4,7 @@ self: super:
     buildGoPackage = self.buildGo112Package;
   };
   ripcord = super.callPackage ../packages/ripcord {};
+  node2nixPackages = import ../packages/node2nix {
+    pkgs = super;
+  };
 }
diff --git a/user/settings/javascript.nix b/user/settings/javascript.nix
index 7f7bc648..ee7a1521 100644
--- a/user/settings/javascript.nix
+++ b/user/settings/javascript.nix
@@ -3,9 +3,6 @@
 let
   node = pkgs.nodejs-12_x;
   node10Packages = pkgs.nodePackages_10_x;
-  node2nixPackages = import ../packages/node2nix/default.nix {
-    inherit pkgs;
-  };
 in
 { home.packages = (with pkgs; [
     node
@@ -37,8 +34,8 @@ in
     eslint_d
     prettier
     typescript
-  ]) ++ (with node2nixPackages; [
-    node2nixPackages."pnpm-4.1.7"
+  ]) ++ (with pkgs.node2nixPackages; [
+    pkgs.node2nixPackages."pnpm-4.1.7"
 
     bunyan
     netlify-cli
-- 
cgit 1.4.1