Updating vwm and its libraries.

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

6 files changed, 48 insertions, 39 deletions

diff --git a/pkgs/applications/window-managers/vwm/default.nix b/pkgs/applications/window-managers/vwm/default.nix
index fa2e6efb30c..7329c48f41d 100644
--- a/pkgs/applications/window-managers/vwm/default.nix
+++ b/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;
   };
 }
diff --git a/pkgs/applications/window-managers/vwm/signal.patch b/pkgs/applications/window-managers/vwm/signal.patch
deleted file mode 100644
index b6cac4d262a..00000000000
--- a/pkgs/applications/window-managers/vwm/signal.patch
+++ /dev/null
@@ -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>
diff --git a/pkgs/development/libraries/libpseudo/default.nix b/pkgs/development/libraries/libpseudo/default.nix
index c200a379187..4e13e5768f8 100644
--- a/pkgs/development/libraries/libpseudo/default.nix
+++ b/pkgs/development/libraries/libpseudo/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, pkgconfig, glib, ncurses}:
-stdenv.mkDerivation {
-  name = "libpseudo-1.1.0";
+stdenv.mkDerivation rec {
+  name = "libpseudo-1.2.0";
 
   src = fetchurl {
-    url = mirror://sourceforge/libpseudo/libpseudo-1.1.0.tar.gz;
-    sha256 = "0fp64c6sbdrp4gs4a7rnh5zwis73p7zg04basdn91byshvs1giwv";
+    url = "mirror://sourceforge/libpseudo/${name}.tar.gz";
+    sha256 = "0d3pw0m3frycr3x5kzqcaj4r2qh43iv6b0fpd6l4yk0aa4a9560n";
   };
 
   patchPhase = ''
diff --git a/pkgs/development/libraries/libviper/default.nix b/pkgs/development/libraries/libviper/default.nix
index 10dee7d5638..b9dbaf23512 100644
--- a/pkgs/development/libraries/libviper/default.nix
+++ b/pkgs/development/libraries/libviper/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, pkgconfig, glib, ncurses, gpm}:
-stdenv.mkDerivation {
-  name = "libviper-1.2.2";
+stdenv.mkDerivation rec {
+  name = "libviper-1.4.5";
 
   src = fetchurl {
-    url = mirror://sourceforge/libviper/libviper-1.4.2.tar.gz;
-    sha256 = "06ff9i914cxi3ifnr5xfpfbvz46kx150jaxvr6rcha6ylglw48c9";
+    url = "mirror://sourceforge/libviper/${name}.tar.gz";
+    sha256 = "1lryqv9xfsshx8x8c858h8fmsi2fkja0mhw415wa2bj9cqyb8byz";
   };
 
   patchPhase = ''
diff --git a/pkgs/development/libraries/libvterm/default.nix b/pkgs/development/libraries/libvterm/default.nix
new file mode 100644
index 00000000000..b449d9c3ed3
--- /dev/null
+++ b/pkgs/development/libraries/libvterm/default.nix
@@ -0,0 +1,26 @@
+{stdenv, fetchurl, pkgconfig, glib, ncurses}:
+stdenv.mkDerivation rec {
+  name = "libvterm-0.99.7";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/libvterm/${name}.tar.gz";
+    sha256 = "10gaqygmmwp0cwk3j8qflri5caf8vl3f7pwfl2svw5whv8wkn0k2";
+  };
+
+  patchPhase = ''
+    sed -i -e s@/usr@$out@ -e /ldconfig/d Makefile
+  '';
+
+  preInstall = ''
+    ensureDir $out/include
+    ensureDir $out/lib
+  '';
+
+  buildInputs = [pkgconfig glib ncurses];
+
+  meta = {
+    homepage = http://libvterm.sourceforge.net/;
+    description = "Terminal emulator library to mimic both vt100 and rxvt";
+    license="GPLv2+";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 08d28955b0b..e55fcd43ddb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4106,6 +4106,10 @@ let
     inherit fetchurl stdenv pkgconfig ncurses gpm glib;
   };
 
+  libvterm = import ../development/libraries/libvterm {
+    inherit fetchurl stdenv pkgconfig ncurses glib;
+  };
+
   libvorbis = import ../development/libraries/libvorbis {
     inherit fetchurl stdenv libogg;
   };
@@ -7744,7 +7748,7 @@ let
   };
 
   vwm = import ../applications/window-managers/vwm {
-    inherit fetchurl stdenv ncurses pkgconfig libviper libpseudo gpm glib;
+    inherit fetchurl stdenv ncurses pkgconfig libviper libpseudo gpm glib libvterm;
   };
 
   w3m = import ../applications/networking/browsers/w3m {