diff options
| author | Dave Nicponski <dev.Nicponski.Dave@dev.bwater.com> | 2020-02-10 17:19:26 -0500 |
|---|---|---|
| committer | Dave Nicponski <dev.Nicponski.Dave@dev.bwater.com> | 2020-02-10 17:19:26 -0500 |
| commit | 1b6ef1268fa87d66125938399a42f2b4d416cd8f (patch) | |
| tree | 9f6275619018e3a40ddf7831b9465b8f689975cd /pkgs/applications/version-management | |
| parent | 9a0e92512c8aa27828447bad1d8c13f4979dff0c (diff) | |
| download | nixlib-1b6ef1268fa87d66125938399a42f2b4d416cd8f.tar nixlib-1b6ef1268fa87d66125938399a42f2b4d416cd8f.tar.gz nixlib-1b6ef1268fa87d66125938399a42f2b4d416cd8f.tar.bz2 nixlib-1b6ef1268fa87d66125938399a42f2b4d416cd8f.tar.lz nixlib-1b6ef1268fa87d66125938399a42f2b4d416cd8f.tar.xz nixlib-1b6ef1268fa87d66125938399a42f2b4d416cd8f.tar.zst nixlib-1b6ef1268fa87d66125938399a42f2b4d416cd8f.zip | |
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).
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 |