mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-09-11 15:08:33 +01:00
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
This commit is contained in:
parent
775542900b
commit
4262167be0
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue