update wmii. libixp vanished

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

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

@@ -1,12 +1,14 @@
 args: with args; stdenv.mkDerivation {
-  name = "wmii-20071116";
+  name = "wmii-3.9b1";
 
   src = fetchurl {
-    url = http://dl.suckless.org/wmii/wmii-3.6.tar.gz;
-    sha256 = "46f39b788c5ef4695040b36cc7d9c539db0306bafc4d8cefdc5980ed4331b216";
+    url = http://dl.suckless.org/wmii/wmii+ixp-3.9b1.tbz;
+    name = "wmii+ixp-3.9b1.tar.bz2"; # srcUnpack does not know about tbz
+    sha256 = "0i04mf5cl4m6mn5kcy913mmrnd2ir0ardmskswchnr6fxpbcyvml";
   };
 
-  buildInputs = [ libX11 libixp xextproto libXt libXext ];
+  buildInputs = [ libX11 libixp xextproto libXt libXext libXft
+    freetype libXrandr libXinerama pkgconfig];
   inherit libixp;
 
   phases = "unpackPhase installPhase";

pkgs/development/libraries/libixp_for_wmii/default.nix

@@ -7,15 +7,15 @@ stdenv.mkDerivation {
      sed -i -e \"s%^PREFIX.*%PREFIX=\$out%\" \\
             -e \"s%^\\(INCLUDE.*\\)%\\1 \$NIX_CFLAGS_COMPILE%\" \\
             -e \"s%^\\(LIBS.*\\)%\\1 \$LDFLAGS%\" \\
-            config.mk
+              config.mk
      make
      mkdir -p \$out/include
      cp -r include/*.h \$out/include
      cp -r lib \$out
   ";
   src = fetchurl {
-    url = http://dl.suckless.org/libs/libixp-0.4.tar.gz;
-    sha256 = "0b44p9wvmzxpyf2xd86rxyr49bmfh9cd5hj3d234gkvynvgph60p";
+    url = http://dl.suckless.org/libs/libixp-0.5.tar.gz;
+    sha256 = "0jqyw8xzih7x7apdp2s9w8agjry890kf55zj2habsg78cyxz1x35";
   };
 
   meta = {

pkgs/top-level/all-packages.nix

@@ -8564,8 +8564,9 @@ let
 
   wmiiSnap = import ../applications/window-managers/wmii {
     libixp = libixp_for_wmii;
-    inherit fetchurl /* fetchhg */ stdenv gawk;
-    inherit (xlibs) libX11 xextproto libXt libXext;
+    inherit fetchurl /* fetchhg */ stdenv gawk
+      freetype pkgconfig;
+    inherit (xlibs) libX11 xextproto libXt libXext libXft libXrandr libXinerama;
     includeUnpack = getConfig ["stdenv" "includeUnpack"] false;
   };