diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-11-04 22:38:26 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-11-04 22:38:26 +0000 |
| commit | 2e8ae96930240308d69341bc53973077c490cb89 (patch) | |
| tree | 417e763b9bf897a93269d46e86eb288194acd18b /pkgs/applications/window-managers/vwm | |
| parent | 13a369476bfbec13962a7f061118d767adefa001 (diff) | |
| download | nixpkgs-2e8ae96930240308d69341bc53973077c490cb89.tar nixpkgs-2e8ae96930240308d69341bc53973077c490cb89.tar.gz nixpkgs-2e8ae96930240308d69341bc53973077c490cb89.tar.bz2 nixpkgs-2e8ae96930240308d69341bc53973077c490cb89.tar.lz nixpkgs-2e8ae96930240308d69341bc53973077c490cb89.tar.xz nixpkgs-2e8ae96930240308d69341bc53973077c490cb89.tar.zst nixpkgs-2e8ae96930240308d69341bc53973077c490cb89.zip | |
Updating vwm and its libraries.
svn path=/nixpkgs/trunk/; revision=18123
Diffstat (limited to 'pkgs/applications/window-managers/vwm')
| -rw-r--r-- | pkgs/applications/window-managers/vwm/default.nix | 17 | ||||
| -rw-r--r-- | pkgs/applications/window-managers/vwm/signal.patch | 22 |
2 files changed, 9 insertions, 30 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> |