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

pkgs/applications/misc/wordnet/default.nix

@@ -15,7 +15,7 @@ stdenv.mkDerivation {
                    "--with-tk="  + tk  + "/lib";
 
   postInstall = ''
-    wrapProgram $out/bin/wishwn --set TK_LIBRARY "${tk}/lib/tk8.4"
+    wrapProgram $out/bin/wishwn --set TK_LIBRARY "${tk}/lib/${tk.libPrefix}"
     wrapProgram $out/bin/wnb    --prefix PATH : "$out/bin"
   '';
 

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

@@ -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 ''

pkgs/applications/version-management/git-and-tools/git/git-git.nix

@@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
 
    + (if guiSupport then ''
        # Wrap Tcl/Tk programs
-         wrapArgs="$wrapArgs --set TK_LIBRARY ${tk}/lib/tk8.4"
+         wrapArgs="$wrapArgs --set TK_LIBRARY ${tk}/lib/${tk.libPrefix}"
          wrapArgs="$wrapArgs --prefix PATH : ${tk}/bin"
      '' else "")
 

pkgs/applications/version-management/mercurial/default.nix

@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
       hgk=$out/lib/${python.libPrefix}/site-packages/hgext/hgk.py
       EOF
       # setting HG so that hgk can be run itself as well (not only hg view)
-      WRAP_TK=" --set TK_LIBRARY \"${tk}/lib/tk8.4\"
+      WRAP_TK=" --set TK_LIBRARY \"${tk}/lib/${tk.libPrefix}\"
                 --set HG \"$out/bin/hg\"
                 --prefix PATH : \"${tk}/bin\" "
     ''

pkgs/development/libraries/tk/default.nix

@@ -19,4 +19,8 @@ stdenv.mkDerivation {
   buildInputs = [tcl x11];
   
   inherit tcl;
+
+  passthru = {
+    libPrefix = "tk8.5";
+  };
 }