From 1b6ef1268fa87d66125938399a42f2b4d416cd8f Mon Sep 17 00:00:00 2001 From: Dave Nicponski Date: Mon, 10 Feb 2020 17:19:26 -0500 Subject: [PATCH] git: Fix git-gui to work on Catalina 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). --- .../version-management/git-and-tools/git/default.nix | 1 + 1 file changed, 1 insertion(+) 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 d448f7b9c16..a7f13905e7c 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