Tk version number is now 8.5 but at several places TK_LIBRARY is set "${tk}/lib/tk8.4". As for Python, tk.libPrefix is introduced to match "tk8.5".

contributed by David Guibert Signed-off-by: David Guibert <david.guibert@gmail.com> svn path=/nixpkgs/trunk/; revision=22041
2010-05-28 10:57:50 +00:00
parent 629849c449
commit 932899f3da
5 changed files with 8 additions and 4 deletions
@@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
       for prog in bin/gitk libexec/git-core/git-gui
       do
         wrapProgram "$out/$prog"                       \
-                     --set TK_LIBRARY "${tk}/lib/tk8.4" \
+                     --set TK_LIBRARY "${tk}/lib/${tk.libPrefix}" \
                     --prefix PATH : "${tk}/bin"
       done
     '' else ''