BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
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
This commit is contained in:
Eelco Dolstra 2012-01-20 17:43:50 +00:00
parent 94c7bec49d
commit c44e954bdc
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
pkgs/tools/filesystems/squashfs/default.nix
View file

@ -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";