Updating vwm and its libraries.

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

pkgs/applications/window-managers/vwm/default.nix

@@ -1,11 +1,12 @@
-{stdenv, fetchurl, ncurses, pkgconfig, glib, libviper, libpseudo, gpm}:
+{stdenv, fetchurl, ncurses, pkgconfig, glib, libviper, libpseudo, gpm,
+libvterm}:
 
-stdenv.mkDerivation {
-  name = "vwm-2.0.1";
+stdenv.mkDerivation rec {
+  name = "vwm-2.1.3";
  
   src = fetchurl {
-    url = mirror://sourceforge/vwm/vwm-2.0.1.tar.gz;
-    sha256 = "1kn1ga35kvl10s3xvgr5ys18gd4pp0gwah4pnvmfkvg0xazjrc0h";
+    url = "mirror://sourceforge/vwm/${name}.tar.gz";
+    sha256 = "1r5wiqyfqwnyx7dfihixlnavbvg8rni36i4gq169aisjcg7laxaf";
   };
 
   prePatch = ''
@@ -15,17 +16,17 @@ stdenv.mkDerivation {
       -e /ldconfig/d Makefile modules/*/Makefile vwm.h
   '';
 
-  patches = [ ./signal.patch ];
-
   preInstall = ''
     ensureDir $out/bin $out/include
   '';
  
-  buildInputs = [ ncurses pkgconfig glib libviper libpseudo gpm];
+  buildInputs = [ ncurses pkgconfig glib libviper libpseudo gpm libvterm ];
  
   meta = {
     homepage = http://vwm.sourceforge.net/;
     description = "Dynamic window manager for the console";
     license="GPLv2+";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
   };
 }

pkgs/applications/window-managers/vwm/signal.patch

@@ -1,22 +0,0 @@
-diff --git a/modules/vwmterm2/signals.c b/modules/vwmterm2/signals.c
-index 239e7f2..07d78fd 100644
---- a/modules/vwmterm2/signals.c
-+++ b/modules/vwmterm2/signals.c
-@@ -1,4 +1,5 @@
- #include <vwm.h>
-+#include <signal.h>
- 
- struct sigaction* vwmterm_sigset(int signum,sighandler_t handler)
- {
-diff --git a/vwm_private.h b/vwm_private.h
-index 2d48ebf..46457bd 100644
---- a/vwm_private.h
-+++ b/vwm_private.h
-@@ -2,6 +2,7 @@
- #define _H_VWM_PRIVATE_
- 
- #include <glib.h>
-+#include <signal.h>
- 
- #ifdef _VIPER_WIDE
- #include <ncursesw/curses.h>