From 4262167be09cde073dd5f86dadca759dfd917a40 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 2 Feb 2011 11:16:57 +0000 Subject: [PATCH] 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 --- .../version-management/git-and-tools/git/default.nix | 9 ++------- 1 file 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