summary refs log tree commit diff stats
path: root/user
diff options
context:
space:
mode:
authorAlan Pearce2021-03-02 11:55:44 +0100
committerAlan Pearce2021-03-02 11:55:44 +0100
commitc74502252781fdfa816fc77e5af08eb0eb6b1d2c (patch)
tree3d1078fbbd7560f510ee6cde6906c339f1e7f8ce /user
parentd3a443b5451a566e4039aeaee1672bd86ea482eb (diff)
downloadnixfiles-c74502252781fdfa816fc77e5af08eb0eb6b1d2c.tar.lz
nixfiles-c74502252781fdfa816fc77e5af08eb0eb6b1d2c.tar.zst
nixfiles-c74502252781fdfa816fc77e5af08eb0eb6b1d2c.zip
Use system nodejs version for node2nix packages
Diffstat (limited to 'user')
-rw-r--r--user/packages/node2nix/Makefile2
-rw-r--r--user/settings/javascript.nix13
2 files changed, 12 insertions, 3 deletions
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