From bec3f8af9468612cf9c02ca375723a02a223a20d Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Fri, 13 Dec 2019 15:16:18 +0100
Subject: Install npm-merge-driver instead of relying on npx

---
 user/settings/git.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'user/settings')

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;
-- 
cgit 1.4.1