about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorRob Vermaas <rob.vermaas@gmail.com>2011-01-17 19:41:05 +0000
committerRob Vermaas <rob.vermaas@gmail.com>2011-01-17 19:41:05 +0000
commitb7f536027dfa147131b856781fa10a68ba2c2661 (patch)
tree3ed034de300636cb4a80b1ad3fda6c0de92708e5 /pkgs
parentb8b5a5868148862ad9df598e90bc7d38d19ba33f (diff)
downloadnixlib-b7f536027dfa147131b856781fa10a68ba2c2661.tar
nixlib-b7f536027dfa147131b856781fa10a68ba2c2661.tar.gz
nixlib-b7f536027dfa147131b856781fa10a68ba2c2661.tar.bz2
nixlib-b7f536027dfa147131b856781fa10a68ba2c2661.tar.lz
nixlib-b7f536027dfa147131b856781fa10a68ba2c2661.tar.xz
nixlib-b7f536027dfa147131b856781fa10a68ba2c2661.tar.zst
nixlib-b7f536027dfa147131b856781fa10a68ba2c2661.zip
enable lzma support in squashfs-tools
svn path=/nixpkgs/trunk/; revision=25602
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/tools/filesystems/squashfs/default.nix7
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix
index a092064dbf5b..a7eb9eb0a1f2 100644
--- a/pkgs/tools/filesystems/squashfs/default.nix
+++ b/pkgs/tools/filesystems/squashfs/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, zlib, attr}:
+{stdenv, fetchurl, zlib, attr, xz}:
 
 stdenv.mkDerivation rec {
   name = "squashfs-4.1";
@@ -8,16 +8,17 @@ stdenv.mkDerivation rec {
     sha256 = "0sh40r7gz81fg7ivgr7rld8spvqb6hsfvnf6gd3gbcr5b830v1rs";
   };
   
-  buildInputs = [zlib attr];
+  buildInputs = [zlib attr xz];
 
   preBuild = ''
     cd squashfs-tools
   '';
+  IUSE="+gzip +lzma";
 
   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";