diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-02-19 16:58:40 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-02-19 16:58:40 +0000 |
commit | 5baef98dd955be75af207e0dad8073bcbc049e19 (patch) | |
tree | adcfaf8d37d7a86cd49565f5bc179836dc323767 | |
parent | e07a111edc614009e55476c4df31137e2dbeb76f (diff) |
* Cromfs updated to 1.5.10 (to get it to build with GCC 4.6).
svn path=/nixpkgs/branches/stdenv-updates/; revision=32400
-rw-r--r-- | pkgs/tools/archivers/cromfs/default.nix | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/pkgs/tools/archivers/cromfs/default.nix b/pkgs/tools/archivers/cromfs/default.nix index 943525d3853c..3512d62223f4 100644 --- a/pkgs/tools/archivers/cromfs/default.nix +++ b/pkgs/tools/archivers/cromfs/default.nix @@ -1,20 +1,14 @@ -{stdenv, fetchurl, pkgconfig, fuse, perl}: +{ stdenv, fetchurl, pkgconfig, fuse, perl }: stdenv.mkDerivation rec { - name = "cromfs-1.5.9.1"; + name = "cromfs-1.5.10"; + src = fetchurl { url = "http://bisqwit.iki.fi/src/arch/${name}.tar.bz2"; - sha256 = "02k0nd7zvcksn7vjxlynsdgdvkayfzzhv622n9zkka94756lr0fk"; + sha256 = "1w079zb5scv6bj919ndr0fkiirq2bkyjrnmwqrr9yzwbyinzg73j"; }; - patchPhase = ''sed -i 's@/bin/bash@/bin/sh@g' configure; set -x''; - - meta = { - description = "FUSE Compressed ROM filesystem with lzma" ; - homepage = http://bisqwit.iki.fi/source/cromfs.html; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; - }; + patchPhase = ''sed -i 's@/bin/bash@/bin/sh@g' configure''; # Removing the static linking, as it doesn't compile in x86_64. makeFlags = "cromfs-driver util/mkcromfs util/unmkcromfs util/cvcromfs"; @@ -27,5 +21,12 @@ stdenv.mkDerivation rec { install util/unmkcromfs $out/bin ''; - buildInputs = [pkgconfig fuse perl]; + buildInputs = [ pkgconfig fuse perl ]; + + meta = { + description = "FUSE Compressed ROM filesystem with lzma"; + homepage = http://bisqwit.iki.fi/source/cromfs.html; + maintainers = [ stdenv.lib.maintainers.viric ]; + platforms = stdenv.lib.platforms.linux; + }; } |