all repos — nixfiles @ bec3f8af9468612cf9c02ca375723a02a223a20d

System and user configuration, managed by nix and home-manager

Install npm-merge-driver instead of relying on npx

Alan Pearce
commit

bec3f8af9468612cf9c02ca375723a02a223a20d

parent

d4e727774fc7be10c25e0b750e60cae75e359046

1 file changed, 1 insertion(+), 1 deletion(-)

changed files
M user/settings/git.nixuser/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;