Merge pull request #79769 from virusdave/dnicponski/scratch/make_git_gui_work_on_modern_mac
git: Fix git-gui to work on Catalina
commitaf1fffab5b89d363ef506e0f9d73a2d604111675
authorDaiderd Jordan <daiderd@gmail.com>
dateWed 19 Feb 2020, 20:25 (7 years ago)
parent24013ab1b6ef12
pkgs/applications/version-management/git-and-tools/git/default.nix+1
@@ -234,6 +234,7 @@ stdenv.mkDerivation {
234234 for prog in bin/gitk libexec/git-core/{git-gui,git-citool,git-gui--askpass}; do
235235 sed -i -e "s|exec 'wish'|exec '${tk}/bin/wish'|g" \
236236 -e "s|exec wish|exec '${tk}/bin/wish'|g" \
237+ -e "s|exec \"[^\"]*/MacOS/Wish\"|exec '${tk}/bin/wish'|g" \
237238 "$out/$prog"
238239 done
239240 ln -s $out/share/git/contrib/completion/git-completion.bash $out/share/bash-completion/completions/gitk