From c74502252781fdfa816fc77e5af08eb0eb6b1d2c Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Tue, 2 Mar 2021 11:55:44 +0100
Subject: Use system nodejs version for node2nix packages

---
 user/packages/node2nix/Makefile |  2 +-
 user/settings/javascript.nix    | 13 +++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

(limited to 'user')

diff --git a/user/packages/node2nix/Makefile b/user/packages/node2nix/Makefile
index 740012ed..ae9b07e2 100644
--- a/user/packages/node2nix/Makefile
+++ b/user/packages/node2nix/Makefile
@@ -1,5 +1,5 @@
 default.nix: node-packages.json
-	nix-shell -p nodePackages.node2nix --run "node2nix --nodejs-12 --input $<"
+	nix-shell -p nodePackages.node2nix --run "node2nix --nodejs-14 --input $<"
 
 install: default.nix
 	nix-env -f default.nix -i
diff --git a/user/settings/javascript.nix b/user/settings/javascript.nix
index f9a44b67..e68aa6e4 100644
--- a/user/settings/javascript.nix
+++ b/user/settings/javascript.nix
@@ -1,9 +1,18 @@
 { config, pkgs, ... }:
 
 let
-  node = pkgs.nodejs-12_x;
+  node = pkgs.nodejs-14_x;
 in
-{ home.packages = (with pkgs; [
+{
+  nixpkgs.overlays = [
+    (self: super: {
+      node2nixPackages = super.callPackage ../packages/node2nix {
+        nodejs = node;
+      };
+    })
+  ];
+
+  home.packages = (with pkgs; [
     node
   ] ++ (
     if stdenv.isDarwin
-- 
cgit 1.4.1