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
This commit is contained in:
Lluís Batlle i Rossell 2010-05-07 14:18:00 +00:00
parent f96b77a4ce
commit 6dd72c5897
3 changed files with 21 additions and 30 deletions

View file

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

View file

@ -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 ];
}

View file

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