diff options
| author | Robin Gloster <mail@glob.in> | 2021-05-24 09:55:24 -0500 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2021-05-24 09:55:24 -0500 |
| commit | 4bc5fbef9d159e143fb7e2c3231932e6e76f667c (patch) | |
| tree | e2198f5c552e0667d838b8ec764ddb3a4d8f6dec /pkgs/shells/fish/plugins | |
| parent | jq: fix build with structured-attrs on darwin (diff) | |
| parent | Merge pull request #123802 from superherointj/package-virtmanager-bugfix (diff) | |
| download | nixpkgs-origin/structured-attrs.tar.gz | |
Merge remote-tracking branch 'upstream/master' into structured-attrsorigin/structured-attrs
Diffstat (limited to 'pkgs/shells/fish/plugins')
| -rw-r--r-- | pkgs/shells/fish/plugins/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/shells/fish/plugins/forgit.nix | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/shells/fish/plugins/default.nix b/pkgs/shells/fish/plugins/default.nix index 42252ccbe38c..0ce172ec489a 100644 --- a/pkgs/shells/fish/plugins/default.nix +++ b/pkgs/shells/fish/plugins/default.nix @@ -15,7 +15,7 @@ lib.makeScope newScope (self: with self; { foreign-env = callPackage ./foreign-env { }; - forgit-fish = callPackage ./forgit.nix { }; + forgit = callPackage ./forgit.nix { }; fzf-fish = callPackage ./fzf-fish.nix { }; diff --git a/pkgs/shells/fish/plugins/forgit.nix b/pkgs/shells/fish/plugins/forgit.nix index b905b7a25895..5fc647c73ee3 100644 --- a/pkgs/shells/fish/plugins/forgit.nix +++ b/pkgs/shells/fish/plugins/forgit.nix @@ -4,7 +4,11 @@ buildFishPlugin rec { pname = "forgit"; version = "unstable-2021-04-09"; - buildInputs = [ git fzf ]; + preFixup = '' + substituteInPlace $out/share/fish/vendor_conf.d/forgit.plugin.fish \ + --replace "fzf " "${fzf}/bin/fzf " \ + --replace "git " "${git}/bin/git " + ''; src = fetchFromGitHub { owner = "wfxr"; |