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

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

1 files changed, 8 insertions, 9 deletions

diff --git a/pkgs/tools/networking/socat/1.6.0.0.nix b/pkgs/tools/networking/socat/1.6.0.0.nix
index 80dd1276a10..1e176f47720 100644
--- a/pkgs/tools/networking/socat/1.6.0.0.nix
+++ b/pkgs/tools/networking/socat/1.6.0.0.nix
@@ -6,15 +6,14 @@ args : with args; with builderDefs {src="";} null;
             sha256 = "1j01iazwfr63q71cfcfzrdz8digqlg3ldhlbb72yl5mn9awr0w0m";
         };
         patches = [
-        fetchurl {
-            url = http://www.dest-unreach.org/socat/contrib/socat-servicenames.patch;
-            sha256 = "1r8zd6mk257n01i34i5syxl2k6fr35nlr7bqs9sfc79irjl62z66";
-        };
-        fetchurl {
-            url = http://www.dest-unreach.org/socat/contrib/socat-maxfds.patch.gz;
-            sha256 = "0fsn0k0qsrdbjbhj09a6kxfsxb7yhxs4cad26znd9naginsj7pxa";
-        };
-        
+          (fetchurl {
+              url = http://www.dest-unreach.org/socat/contrib/socat-servicenames.patch;
+              sha256 = "1r8zd6mk257n01i34i5syxl2k6fr35nlr7bqs9sfc79irjl62z66";
+          })
+          (fetchurl {
+              url = http://www.dest-unreach.org/socat/contrib/socat-maxfds.patch.gz;
+              sha256 = "0fsn0k0qsrdbjbhj09a6kxfsxb7yhxs4cad26znd9naginsj7pxa";
+          })
         ];
         buildInputs = [openssl];
         configureFlags = [];