diff options
author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-05-07 14:18:00 +0000 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-05-07 14:18:00 +0000 |
commit | 6dd72c5897784fa4d3b25525abcb105ffe752de6 (patch) | |
tree | 242cbf69bf7243958e197a4412e44cfa2fc0c328 /pkgs/applications/networking/remote | |
parent | f96b77a4ce2b73a61d8f6a7d3c50c57b18f97644 (diff) | |
download | nixlib-6dd72c5897784fa4d3b25525abcb105ffe752de6.tar nixlib-6dd72c5897784fa4d3b25525abcb105ffe752de6.tar.gz nixlib-6dd72c5897784fa4d3b25525abcb105ffe752de6.tar.bz2 nixlib-6dd72c5897784fa4d3b25525abcb105ffe752de6.tar.lz nixlib-6dd72c5897784fa4d3b25525abcb105ffe752de6.tar.xz nixlib-6dd72c5897784fa4d3b25525abcb105ffe752de6.tar.zst nixlib-6dd72c5897784fa4d3b25525abcb105ffe752de6.zip |
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
Diffstat (limited to 'pkgs/applications/networking/remote')
-rwxr-xr-x | pkgs/applications/networking/remote/putty/builder.sh | 12 | ||||
-rw-r--r-- | pkgs/applications/networking/remote/putty/default.nix | 35 |
2 files changed, 19 insertions, 28 deletions
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 ]; } |