diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-01-20 17:43:50 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-01-20 17:43:50 +0000 |
commit | c44e954bdcaae7ce6a1e5760be16e4dc9f528b09 (patch) | |
tree | 4f630b1087cc13ed82bb3f19a1b43e23c17f31fc /pkgs | |
parent | 94c7bec49dd0be92b10ae62967e11855cfa52d07 (diff) | |
download | nixpkgs-c44e954bdcaae7ce6a1e5760be16e4dc9f528b09.tar nixpkgs-c44e954bdcaae7ce6a1e5760be16e4dc9f528b09.tar.gz nixpkgs-c44e954bdcaae7ce6a1e5760be16e4dc9f528b09.tar.bz2 nixpkgs-c44e954bdcaae7ce6a1e5760be16e4dc9f528b09.tar.lz nixpkgs-c44e954bdcaae7ce6a1e5760be16e4dc9f528b09.tar.xz nixpkgs-c44e954bdcaae7ce6a1e5760be16e4dc9f528b09.tar.zst nixpkgs-c44e954bdcaae7ce6a1e5760be16e4dc9f528b09.zip |
* 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
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/tools/filesystems/squashfs/default.nix | 19 |
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"; |