added:

dnsmasq, uisp, fltk libixp_for_wmii, acerhk kernel module, reiserfsprogs, radeontools, msmtp,
procmail, pstree, gxemul

changed:
umlutilities to also support building tunctl optionally (needing kernel header files)
wmii updated and wmiimenu added                                                 

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

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";
+         };
 }

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";
+         };
+}