* Fix the squashfs build (it links against xz, so xz has

  to be in the buildInputs).  While at it, update to 
  version 4.2.  "attr" is no longer needed as a dependency.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31744

1 files changed, 9 insertions, 10 deletions

diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix
index 2fc0befb9aa..f66c54cc9e1 100644
--- a/pkgs/tools/filesystems/squashfs/default.nix
+++ b/pkgs/tools/filesystems/squashfs/default.nix
@@ -1,24 +1,23 @@
-{stdenv, fetchurl, zlib, attr, xz}:
+{ stdenv, fetchurl, zlib, xz }:
 
 stdenv.mkDerivation rec {
-  name = "squashfs-4.1";
+  name = "squashfs-4.2";
 
   src = fetchurl {
-    url = mirror://sourceforge/squashfs/squashfs4.1.tar.gz;
-    sha256 = "0sh40r7gz81fg7ivgr7rld8spvqb6hsfvnf6gd3gbcr5b830v1rs";
+    url = mirror://sourceforge/squashfs/squashfs4.2.tar.gz;
+    sha256 = "15if08j0pl5hmnz9pwshwrp4fjp0jsm9larjxmjvdnr2m5d1kq6r";
   };
   
-  buildInputs = [zlib attr];
-
-  preBuild = ''
-    cd squashfs-tools
-  '';
-  IUSE="+gzip +lzma";
+  buildInputs = [ zlib xz ];
 
+  preBuild = "cd squashfs-tools";
+  
   NIX_LDFLAGS = "-lgcc_s"; # for pthread_cancel
 
   installFlags = "INSTALL_DIR=\${out}/bin";
+  
   makeFlags = "XZ_SUPPORT=1";
+  
   meta = {
     homepage = http://squashfs.sourceforge.net/;
     description = "Tool for creating and unpacking squashfs filesystems";