diff options
author | a-n-n-a-l-e-e <150648636+a-n-n-a-l-e-e@users.noreply.github.com> | 2024-03-29 11:26:02 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-29 11:26:02 -0700 |
commit | 2d864d1843c54a11f7f5b0279f937d73b3bd0a39 (patch) | |
tree | 148d4b9a13f03bab0511f8f46ccea49774fa1ae6 | |
parent | e283be86cb3b15314a338c777138493714449475 (diff) | |
parent | 01738bd3bd77231a485e4ab1b99fa1caabeb75e5 (diff) |
Merge pull request #296261 from becknik/fix-fzf-git-sh2
fzf-git-sh: Fix substituting to many `git` occurrences
-rw-r--r-- | pkgs/shells/fzf-git-sh/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/shells/fzf-git-sh/default.nix b/pkgs/shells/fzf-git-sh/default.nix index 8d7ce5d1e0f70..e9cda521fb1db 100644 --- a/pkgs/shells/fzf-git-sh/default.nix +++ b/pkgs/shells/fzf-git-sh/default.nix @@ -39,12 +39,12 @@ stdenv.mkDerivation rec { -e "s,\buniq\b,${coreutils}/bin/uniq," \ -e "s,\bcolumn\b,${util-linux}/bin/column," \ -e "s,\bfzf-tmux\b,${fzf}/bin/fzf-tmux," \ - -e "/display-message/!s,\bgit\b,${git}/bin/git,g" \ -e "s,\bgrep\b,${gnugrep}/bin/grep," \ -e "s,\bsed\b,${gnused}/bin/sed," \ -e "/fzf-tmux/!s,\btmux\b,${tmux}/bin/tmux," \ -e "s,\bxargs\b,${findutils}/bin/xargs," \ -e "s,\bxdg-open\b,${xdg-utils}/bin/xdg-open," \ + -e "/display-message\|fzf-git-\$o-widget\|\burl=\|\$remote_url =~ /!s,\bgit\b,${git}/bin/git,g" \ -e "s,__fzf_git=.*BASH_SOURCE.*,__fzf_git=$out/share/${pname}/fzf-git.sh," \ -e "/__fzf_git=.*readlink.*/d" \ fzf-git.sh |