From 6dd72c5897784fa4d3b25525abcb105ffe752de6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Fri, 7 May 2010 14:18:00 +0000
Subject: [PATCH] Updating putty to the last svn version, so now it can work
 with gtk2. The previous wanted gtk1, that did not build on x86_64-linux

svn path=/nixpkgs/trunk/; revision=21649
---
 .../networking/remote/putty/builder.sh        | 12 -------
 .../networking/remote/putty/default.nix       | 35 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  4 +--
 3 files changed, 21 insertions(+), 30 deletions(-)
 delete mode 100755 pkgs/applications/networking/remote/putty/builder.sh

diff --git a/pkgs/applications/networking/remote/putty/builder.sh b/pkgs/applications/networking/remote/putty/builder.sh
deleted file mode 100755
index 8b7da0a84e41..000000000000
--- a/pkgs/applications/networking/remote/putty/builder.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-source $stdenv/setup
-
-tar zxvf $src
-cd putty-*/unix/
-
-ensureDir $out/bin
-ensureDir $out/share/man/man1
-
-./configure --prefix=$out --with-gtk-prefix=$gtk
-make
-make install
-
diff --git a/pkgs/applications/networking/remote/putty/default.nix b/pkgs/applications/networking/remote/putty/default.nix
index 402b5a520f45..747413400b39 100644
--- a/pkgs/applications/networking/remote/putty/default.nix
+++ b/pkgs/applications/networking/remote/putty/default.nix
@@ -1,22 +1,25 @@
-{ stdenv, fetchurl, ncurses
-, gtk
-}:
+{ stdenv, fetchsvn, ncurses, gtk, pkgconfig, autoconf, automake, perl, halibut }:
  
 stdenv.mkDerivation {
-  name = "putty-0.60";
-  builder = ./builder.sh;
+  name = "putty-r8934";
+  # builder = ./builder.sh;
+
+  preConfigure = ''
+    perl mkfiles.pl
+    ( cd doc ; make );
+    cd unix
+    sed '/AM_PATH_GTK(/d' -i configure.ac
+    cp ${automake}/share/automake-*/install-sh .
+    autoreconf -vf
+  '';
   
-  src = fetchurl {
-    url = http://the.earth.li/~sgtatham/putty/latest/putty-0.60.tar.gz;
-    sha256 = "b2bbaaf9324997e85cf15d44ed41e8e89539c8215dceac9d6d7272a37dbc2849";
+  # The hash is going to change on new snapshot.
+  # I don't know of any better URL
+  src = fetchsvn {
+    url = svn://svn.tartarus.org/sgt/putty;
+    rev = 8934;
+    sha256 = "1yg5jhk7jp4yrnhpi0lvz71qqaf5gfpcwy8p198qqs8xgd1w51jc";
   };
 
-  buildInputs = [
-   gtk ncurses
-  ];
-
-  #propagatedBuildInputs = [
-  #];
-
-  inherit gtk;
+  buildInputs = [ gtk ncurses pkgconfig autoconf automake perl halibut ];
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 46326db274b8..4949b3d8656f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9433,8 +9433,8 @@ let
   };
 
   putty = import ../applications/networking/remote/putty {
-    inherit stdenv fetchurl ncurses;
-    inherit (gtkLibs1x) gtk;
+    inherit stdenv fetchsvn ncurses pkgconfig autoconf automake perl halibut;
+    inherit (gtkLibs) gtk;
   };
 
   rssglx = import ../misc/screensavers/rss-glx {