summary refs log tree commit diff stats
path: root/user/settings
diff options
context:
space:
mode:
Diffstat (limited to 'user/settings')
-rw-r--r--user/settings/git.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/user/settings/git.nix b/user/settings/git.nix
index 0314579b..fabd8102 100644
--- a/user/settings/git.nix
+++ b/user/settings/git.nix
@@ -46,7 +46,7 @@
       };
       "merge.npm-merge-driver" = {
         name = "automatically merge npm lockfiles";
-        driver = "npx npm-merge-driver merge %A %O %B %P";
+        driver = "${pkgs.node2nixPackages."npm-merge-driver"}/bin/npm-merge-driver merge %A %O %B %P";
       };
       remote = {
         autoSetupMerge = true;