Skip to content

Commit

Permalink
git: Fix git-gui to work on Catalina
Browse files Browse the repository at this point in the history
The existing post-install was not successfully patching the git-gui script,
and thus was invoking the packaged osx app which uses the system tk,
which is too old to work (and is no longer supported by Apple anyway).
  • Loading branch information
Dave Nicponski authored and Dave Nicponski committed Feb 10, 2020
1 parent 9a0e925 commit 1b6ef12
Showing 1 changed file with 1 addition and 0 deletions.
Expand Up @@ -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
Expand Down

0 comments on commit 1b6ef12

Please sign in to comment.