5 files changed, 116 insertions, 11 deletions
diff --git a/pkgs/applications/misc/procmail/default.nix b/pkgs/applications/misc/procmail/default.nix
new file mode 100644
index 00000000000..b1d54ef5fc9
--- /dev/null
+++ b/pkgs/applications/misc/procmail/default.nix
@@ -0,0 +1,17 @@
+args: with args; stdenv.mkDerivation {
+  name="procmail-3.22";
+  buildInputs = [stdenv.gcc.libc];
+  installPhase = "
+    ensureDir \$out/bin
+    find . -exec sed -e \"s%^RM[ \\t]*=%RM=`type -f rm | awk '{print $3;}'`%\" -i '{}' ';'
+    sed -e 's%\\(LDFLAGS = \$(LDFLAGS1) -lnsl -ldl -lc\\)%\\1 -m%' -i src/Makefile
+    sed -e \"s%^BASENAME.*%\BASENAME=$out%\" -i Makefile
+    make DESTDIR=\$out install
+   ";
+  phases ="installPhase";
+  src = fetchurl {
+    url = ftp://ftp.fu-berlin.de/pub/unix/mail/procmail/procmail-3.22.tar.gz;
+    sha256 = "05z1c803n5cppkcq99vkyd5myff904lf9sdgynfqngfk9nrpaz08";
+  };
+  o=62;
+}
diff --git a/pkgs/applications/misc/pstree/default.nix b/pkgs/applications/misc/pstree/default.nix
new file mode 100644
index 00000000000..c59148e854e
--- /dev/null
+++ b/pkgs/applications/misc/pstree/default.nix
@@ -0,0 +1,22 @@
+args:
+args.stdenv.mkDerivation {
+  name = "pstree-2.31";
+
+  src = args.fetchurl {
+    url = http://fresh.t-systems-sfr.com/unix/src/misc/pstree-2.31.tar.gz;
+    sha256 = "1zzz29gsyra8csk54cyq0pcdxxg3l4gmksq8q1skv2z84g2yxdhh";
+  };
+
+  unpackPhase="unpackFile \$src; sourceRoot=.";
+  #buildInputs =(with args; []);
+  
+  buildPhase="pwd; gcc -o pstree pstree.c";
+  installPhase="ensureDir \$out/bin; cp pstree \$out/bin";
+
+  meta = { 
+      description = "show the running processes as tree";
+      # don't know the correct homepage..
+      homepage = http://fresh.t-systems-sfr.com/unix/src/misc/pstree-2.31.tar.gz;
+      license = "GPL";
+    }; 
+}
diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix
new file mode 100644
index 00000000000..523620a403e
--- /dev/null
+++ b/pkgs/applications/networking/msmtp/default.nix
@@ -0,0 +1,17 @@
+args:
+args.stdenv.mkDerivation {
+  name = "msmtp-1.4.13";
+
+  src = args.fetchurl {
+    url = http://dfn.dl.sourceforge.net/sourceforge/msmtp/msmtp-1.4.13.tar.bz2;
+    sha256 = "1x8q8dhcpnjym3icz6070l13hz98fvdvgc5j5psj4pmxbswx0r4p";
+  };
+
+  buildInputs =(with args; []);
+
+  meta = { 
+      description = "a MUA";
+      homepage = http://msmtp.sourceforge.net/;
+      license = "GPL";
+    }; 
+}
diff --git a/pkgs/applications/window-managers/wmii/default.nix b/pkgs/applications/window-managers/wmii/default.nix
index faeb8d0640a..f00df902a86 100644
--- a/pkgs/applications/window-managers/wmii/default.nix
+++ b/pkgs/applications/window-managers/wmii/default.nix
@@ -1,15 +1,29 @@
-{ stdenv, fetchurl, libixp, x11, gawk}:
+args: with args; stdenv.mkDerivation {
+  name = "wmii-20070516";
 
-stdenv.mkDerivation {
-  name = "wmii-snap20070304";
-  description = "a really nice window manager which can be entirely driven by keyboard";
-  homepage = "http://www.suckless.org/wiki/wmii/";
-  builder = ./builder.sh;
   src = fetchurl {
-    url =  http://www.suckless.org/snaps/wmii-snap20070304.tgz;
-    sha256 = "06dd2e58c5cbb4adb9a8ba9cb8f19625a15df99b8ab7adec7ddc5844260e6a05";
+    url = http://www.suckless.org/snaps/wmii-snap20070304.tgz;
+    sha256 = "01ba1qk48n6wgpnavdwakgwmv895jvqvi75sm2wsvd6bqmc2xp86";
   };
-  buildInputs = [ libixp ];
-  propagatedBuildInputs = [ x11 ];
-  inherit gawk;
+
+  buildInputs = [ libX11 libixp ];
+  inherit libixp;
+ 
+  phases = "installPhase";
+
+  installPhase = "
+     export CFLAGS=\$NIX_CFLAGS_COMPILE
+     export LDFLAGS\=$(echo \$NIX_LDFLAGS | sed -e 's/-rpath/-L/g')
+     sed -i -e \"s%^PREFIX.*%PREFIX=\$out%\" \\
+            -e \"s%^\\(INCS.*\\)%\\1 \$NIX_CFLAGS_COMPILE%\" \\
+            -e \"s%^\\(LIBS.*\\)%\\1 \$LDFLAGS%\" \\
+            config.mk
+     # don't use the default one installed by nixos!
+     sed -i -e \"s%ixpc%\$libixp/bin/ixpc%\" wmiir
+     make install
+  ";
+  meta = { homepage = "www.suckless.org";
+           description = "a really cool window manager which can by driven by keyboard only";
+           license="MIT";
+         };
 }
diff --git a/pkgs/applications/window-managers/wmii31/default.nix b/pkgs/applications/window-managers/wmii31/default.nix
new file mode 100644
index 00000000000..eb018716a22
--- /dev/null
+++ b/pkgs/applications/window-managers/wmii31/default.nix
@@ -0,0 +1,35 @@
+args: with args; stdenv.mkDerivation {
+  name = "wmiimenu-3.1";
+
+  src = fetchurl {
+    url = http://suckless.org/download/wmii-3.1.tar.gz;
+    sha256 = "0sviwxbanpsfdm55zvx9hflncw35slkz41xr517y3yfgxx6qlhlk";
+  };
+
+  buildInputs = [ libX11 libixp ];
+  inherit libixp;
+ 
+  phases = "installPhase";
+
+  installPhase = "
+     export CFLAGS=\$NIX_CFLAGS_COMPILE
+     export LDFLAGS\=$(echo \$NIX_LDFLAGS | sed -e 's/-rpath/-L/g')
+     sed -i -e \"s%^PREFIX.*%PREFIX=\$out%\" \\
+            -e \"s%^\\(INCS.*\\)%\\1 \$NIX_CFLAGS_COMPILE%\" \\
+            -e \"s%^\\(LIBS.*\\)%\\1 \$LDFLAGS%\" \\
+            config.mk
+     # don't use the default one installed by nixos!
+     # sed -i -e \"s%ixpc%\$libixp/bin/ixpc%\" wmiir
+
+     # This will fail but wmiimenu has been built (hack!)
+     set +e
+     make &> /dev/null
+     set -e
+     ensureDir \$out/bin
+     cp cmd/wmiimenu \$out/bin
+  ";
+  meta = { homepage = "www.suckless.org";
+           description = "one small tool of the wmii window manger to let the user select an item from a list by filtering..";
+           license="MIT";
+         };
+}