diff options
| author | Peter Simons <simons@cryp.to> | 2011-02-02 11:16:57 +0000 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2011-02-02 11:16:57 +0000 |
| commit | 4262167be09cde073dd5f86dadca759dfd917a40 (patch) | |
| tree | 572e491d318f006493ba8bdf35d541ff676c16db /pkgs | |
| parent | 775542900b6d417a48544a2a9189f442fff13d13 (diff) | |
| download | nixpkgs-4262167be09cde073dd5f86dadca759dfd917a40.tar nixpkgs-4262167be09cde073dd5f86dadca759dfd917a40.tar.gz nixpkgs-4262167be09cde073dd5f86dadca759dfd917a40.tar.bz2 nixpkgs-4262167be09cde073dd5f86dadca759dfd917a40.tar.lz nixpkgs-4262167be09cde073dd5f86dadca759dfd917a40.tar.xz nixpkgs-4262167be09cde073dd5f86dadca759dfd917a40.tar.zst nixpkgs-4262167be09cde073dd5f86dadca759dfd917a40.zip | |
pkgs/applications/version-management/git-and-tools/git: fixed git gui module
Patch Tcl/Tk scripts to invoke 'wish' using the complete executable path to ensure that the proper version is being used. svn path=/nixpkgs/trunk/; revision=25755
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/git/default.nix | 9 |
1 files changed, 2 insertions, 7 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 c2a77da8bbc..5dca2a4e651 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -84,15 +84,10 @@ stdenv.mkDerivation rec { + (if guiSupport then '' # Wrap Tcl/Tk programs - for prog in bin/gitk; do - wrapProgram "$out/$prog" \ - --set TK_LIBRARY "${tk}/lib/${tk.libPrefix}" \ - --prefix PATH : "${tk}/bin" - done - for prog in git-gui git-citool git-gui--askpass; do + 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" \ - "$out/libexec/git-core/$prog" + "$out/$prog" done '' else '' # Don't wrap Tcl/Tk, replace them by notification scripts |