[Nix-dev] Re: git-gui: require not using ttk

[Marc Weber]

Excerpts from Yury G. Kudryashov's message of Wed May 26 18:49:40 +0200 2010:
> Marc Weber wrote:
> 
> > Probably the reason is that git gui no longer likes being wrapped.
> Actually, the main problem with git-gui is that it wants to be called as 
> "git-gui", not ".git-gui-wrapped".
> This can be fixed by moving wrappers to .orig/ subdir, and calling 
> ".orig/git-gui" instead of ".git-gui-wrapped". Feel free to fix it in the 
> repo.
Correct. That's why I suggested wrapping git intsead of git-gui because
git would call git-gui then.
 
There is exec -aNAME which seems to work:

  $ exec -a FOO sh -c 'echo $0'
  FOO

but not for #!/bin/sh scripts:

  $ cat /tmp/me.sh
  #!/bin/sh
  echo $0

  $ exec -aFOO /tmp/me.sh
  /tmp/me.sh

Anyway, this patch fixes it, git was not wrapped before.
It wraps git instead of git-gui

  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 9f7149d..d00d037 100644
  --- a/pkgs/applications/version-management/git-and-tools/git/default.nix
  +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
  @@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
   
      + (if guiSupport then ''
          # Wrap Tcl/Tk programs
  -       for prog in bin/gitk libexec/git-core/git-gui
  +       for prog in bin/gitk bin/git
          do
            wrapProgram "$out/$prog"                       \
                        --set TK_LIBRARY "${tk}/lib/tk8.4" \

If there are no objections against this solution I'll commit soon.

Marc Weber