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

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

3 files changed, 18 insertions, 22 deletions

diff --git a/pkgs/development/libraries/tk/8.4.16.nix b/pkgs/development/libraries/tk/8.4.16.nix
new file mode 100644
index 0000000000000..c43e53cc82797
--- /dev/null
+++ b/pkgs/development/libraries/tk/8.4.16.nix
@@ -0,0 +1,18 @@
+args: with args;
+
+stdenv.mkDerivation {
+  name = "tk-${version}";
+  src = fetchurl {
+    url = "mirror://sourceforge/tcl/tk${version}-src.tar.gz";
+    sha256 = "0cciavzd05bpm5yfppid0s0vsf8kabwia9620vgvi26sv1gjgwhb";
+  };
+  postInstall = ''
+    echo -e '#! /bin/sh \n $( readlink -f $( which wish${__substring 0 3 version}) ) "$@"' >$out/bin/wish
+    chmod a+x $out/bin/wish
+  ''; 
+  configureFlags="--with-tcl=${tcl}/lib";
+  preConfigure = "cd unix";
+
+  buildInputs = [tcl x11];
+  inherit tcl;
+}
diff --git a/pkgs/development/libraries/tk/builder.sh b/pkgs/development/libraries/tk/builder.sh
deleted file mode 100644
index 999488a353101..0000000000000
--- a/pkgs/development/libraries/tk/builder.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-source $stdenv/setup
-
-configureFlags="--with-tcl=$tcl/lib"
-preConfigure() {
-  cd unix
-}
-
-preConfigure=preConfigure
-
-genericBuild
diff --git a/pkgs/development/libraries/tk/default.nix b/pkgs/development/libraries/tk/default.nix
deleted file mode 100644
index 9e0a6b8c0dae8..0000000000000
--- a/pkgs/development/libraries/tk/default.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{stdenv, fetchurl, tcl, x11}:
-
-stdenv.mkDerivation {
-  name = "tk-8.4.16";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = mirror://sourceforge/tcl/tk8.4.16-src.tar.gz;
-    sha256 = "0cciavzd05bpm5yfppid0s0vsf8kabwia9620vgvi26sv1gjgwhb";
-  };
-  buildInputs = [tcl x11];
-  inherit tcl;
-}