Install npm-merge-driver instead of relying on npx
1 file changed, 1 insertion(+), 1 deletion(-)
changed files
M user/settings/git.nix → user/settings/git.nix
@@ -46,7 +46,7 @@ textconf = "${pkgs.sops}/bin/sops -d"; }; "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;