Author: simons
Date: Wed Feb 2 11:16:57 2011
New Revision: 25755
URL: https://svn.nixos.org/websvn/nix/?rev=25755&sc=1
Log:
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.
Modified:
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/git/default.nix
Modified:
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/git/default.nix
==============================================================================
---
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/git/default.nix
Wed Feb 2 11:16:53 2011 (r25754)
+++
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/git/default.nix
Wed Feb 2 11:16:57 2011 (r25755)
@@ -84,15 +84,10 @@
+ (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
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
