public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pkgs/applications/version-management/git-and-tools/git: fixed git gui module

Browse Source 
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
This commit is contained in:
Peter Simons 2011-02-02 11:16:57 +00:00
parent 775542900b
commit 4262167be0
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/version-management/git-and-tools/git/default.nix
View File

@ -84,15 +84,10 @@ stdenv.mkDerivation rec {
+ (if guiSupport then '' + (if guiSupport then ''
# Wrap Tcl/Tk programs # Wrap Tcl/Tk programs
for prog in bin/gitk; do for prog in bin/gitk libexec/git-core/{git-gui,git-citool,git-gui--askpass}; 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
sed -i -e "s|exec 'wish'|exec '${tk}/bin/wish'|g" \ sed -i -e "s|exec 'wish'|exec '${tk}/bin/wish'|g" \
-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 done
'' else '' '' else ''
# Don't wrap Tcl/Tk, replace them by notification scripts # Don't wrap Tcl/Tk, replace them by notification scripts