diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2020-02-19 20:25:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-19 20:25:41 +0100 |
| commit | af1fffab5b89d363ef506e0f9d73a2d604111675 (patch) | |
| tree | 9d438ade209f6acb9be916345880a5bad0377f44 /pkgs/applications/version-management | |
| parent | 24013ab951ef34c375c781300dcb3b010a8620ea (diff) | |
| parent | 1b6ef1268fa87d66125938399a42f2b4d416cd8f (diff) | |
| download | nixlib-af1fffab5b89d363ef506e0f9d73a2d604111675.tar nixlib-af1fffab5b89d363ef506e0f9d73a2d604111675.tar.gz nixlib-af1fffab5b89d363ef506e0f9d73a2d604111675.tar.bz2 nixlib-af1fffab5b89d363ef506e0f9d73a2d604111675.tar.lz nixlib-af1fffab5b89d363ef506e0f9d73a2d604111675.tar.xz nixlib-af1fffab5b89d363ef506e0f9d73a2d604111675.tar.zst nixlib-af1fffab5b89d363ef506e0f9d73a2d604111675.zip | |
Merge pull request #79769 from virusdave/dnicponski/scratch/make_git_gui_work_on_modern_mac
git: Fix git-gui to work on Catalina
Diffstat (limited to 'pkgs/applications/version-management')
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/git/default.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index d448f7b9c16a..a7f13905e7cd 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -234,6 +234,7 @@ stdenv.mkDerivation { for prog in bin/gitk libexec/git-core/{git-gui,git-citool,git-gui--askpass}; do sed -i -e "s|exec 'wish'|exec '${tk}/bin/wish'|g" \ -e "s|exec wish|exec '${tk}/bin/wish'|g" \ + -e "s|exec \"[^\"]*/MacOS/Wish\"|exec '${tk}/bin/wish'|g" \ "$out/$prog" done ln -s $out/share/git/contrib/completion/git-completion.bash $out/share/bash-completion/completions/gitk |