Fixed stable socat (applied patch by Nicolas Pierron); updated Tk installation step for XMaxima compatibility

svn path=/nixpkgs/trunk/; revision=10482

1 files changed, 4 insertions, 1 deletions

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 51f94b858d795..6ac651b05e25d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2660,10 +2660,13 @@ rec {
 	qt = qt4;
   };
 
-  tk = import ../development/libraries/tk {
+  tkFun = lib.sumArgs (selectVersion ../development/libraries/tk) {
     inherit fetchurl stdenv tcl x11;
+    version = "8.4.16";
   };
 
+  tk = tkFun null;
+
   unixODBC = import ../development/libraries/unixODBC {
     inherit fetchurl stdenv;
   };