diff options
| author | Alan Pearce | 2019-12-13 15:16:18 +0100 |
|---|---|---|
| committer | Alan Pearce | 2019-12-13 15:16:18 +0100 |
| commit | bec3f8af9468612cf9c02ca375723a02a223a20d (patch) | |
| tree | 7b7e27c3024e08ca97100dc253856eec349d17e4 /user/settings | |
| parent | d4e727774fc7be10c25e0b750e60cae75e359046 (diff) | |
| download | nixfiles-bec3f8af9468612cf9c02ca375723a02a223a20d.tar.lz nixfiles-bec3f8af9468612cf9c02ca375723a02a223a20d.tar.zst nixfiles-bec3f8af9468612cf9c02ca375723a02a223a20d.zip | |
Install npm-merge-driver instead of relying on npx
Diffstat (limited to 'user/settings')
| -rw-r--r-- | user/settings/git.nix | 2 |
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; |