removed libixp-0.3 (wmiimenu does also build with 0.4)

wmii updated

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

1 files changed, 10 insertions, 5 deletions

diff --git a/pkgs/applications/window-managers/wmii/default.nix b/pkgs/applications/window-managers/wmii/default.nix
index a6148e3a4da0..396f69181b69 100644
--- a/pkgs/applications/window-managers/wmii/default.nix
+++ b/pkgs/applications/window-managers/wmii/default.nix
@@ -2,25 +2,30 @@ args: with args; stdenv.mkDerivation {
   name = "wmii-20070516";
 
   src = fetchurl {
-    url = http://www.suckless.org/snaps/wmii-snap20070304.tgz;
-    sha256 = "01ba1qk48n6wgpnavdwakgwmv895jvqvi75sm2wsvd6bqmc2xp86";
+    url = http://www.suckless.org/download/wmii-3.6.tar.gz;
+    sha256 = "05mj651yv02rvkpqqkgwp8307nrrqpcwfv5k8186kx2yiiw9pws6";
   };
 
-  buildInputs = [ libX11 libixp ];
+  buildInputs = [ libX11 libixp xextproto libXt libXext ];
   inherit libixp;
 
   phases = "unpackPhase installPhase";
 
   installPhase = "
+     for i in libfmt libutf libregexp libbio; do
+       cd $i; make; cd ..
+     done
+     mkdir -p \$out/lib
+     cp ${libixp}/lib/libixp.a \$out/lib
      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%\" \\
-	    -e 's%^\\(AWKPATH = \\).*%\\1${gawk}/bin/gawk%' \\
+            -e 's%^\\(AWKPATH = \\).*%\\1${gawk}/bin/gawk%' \\
             config.mk
      # don't use the default one installed by nixos!
-     sed -i -e \"s%ixpc%\$libixp/bin/ixpc%\" wmiir
+     #sed -i -e \"s%ixpc%\$libixp/bin/ixpc%\" wmiir
      make install
   ";
   meta = { homepage = "www.suckless.org";