diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-04-22 21:44:33 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-04-22 21:44:33 +0000 |
| commit | 6f2fac6466cbc684f01093364e60bb96b79c120f (patch) | |
| tree | 2b0ee90e26a0d6ed8a081351299a66daf35ef9f9 /pkgs/tools/compression | |
| parent | 6d62947d71342aa29441a720d4eeb2f003126c76 (diff) | |
| parent | 93d2b4b7bfe5c78e36c93f94a0c057cde04b580f (diff) | |
| download | nixlib-6f2fac6466cbc684f01093364e60bb96b79c120f.tar nixlib-6f2fac6466cbc684f01093364e60bb96b79c120f.tar.gz nixlib-6f2fac6466cbc684f01093364e60bb96b79c120f.tar.bz2 nixlib-6f2fac6466cbc684f01093364e60bb96b79c120f.tar.lz nixlib-6f2fac6466cbc684f01093364e60bb96b79c120f.tar.xz nixlib-6f2fac6466cbc684f01093364e60bb96b79c120f.tar.zst nixlib-6f2fac6466cbc684f01093364e60bb96b79c120f.zip | |
Merging from trunk.
I hope I resolved the conflicts well (gmp and gccCross) svn path=/nixpkgs/branches/stdenv-updates/; revision=21251
Diffstat (limited to 'pkgs/tools/compression')
| -rw-r--r-- | pkgs/tools/compression/ncompress/default.nix | 14 | ||||
| -rw-r--r-- | pkgs/tools/compression/xz/default.nix | 10 |
2 files changed, 16 insertions, 8 deletions
diff --git a/pkgs/tools/compression/ncompress/default.nix b/pkgs/tools/compression/ncompress/default.nix index a97ab190678c..bfdb70c697dc 100644 --- a/pkgs/tools/compression/ncompress/default.nix +++ b/pkgs/tools/compression/ncompress/default.nix @@ -1,20 +1,20 @@ {stdenv, fetchurl}: -stdenv.mkDerivation { - name = "ncompress-4.2.4"; - +stdenv.mkDerivation rec { + name = "ncompress-4.2.4.3"; + builder = ./builder.sh; patches = [ ./makefile.patch ]; - + src = fetchurl { - url = mirror://sourceforge/project/ncompress/ncompress%20%28bugfixes%29/ncompress-4.2.4.2/ncompress-4.2.4.2.tar.gz; - sha256 = "38158c792b769fe23c74f8d3ea0e27569a9b1d21b53a4faf8acbb1ac03743221"; + url = "mirror://sourceforge/project/ncompress/${name}.tar.gz"; + sha256 = "1y44ixc1w2vfvj1lm4dkcljlwv882ynrvm5i6l0lg1gf883j246l"; }; meta = { homepage = http://ncompress.sourceforge.net/; - license = "free-non-copyleft"; + license = "public domain"; description = "A fast, simple LZW file compressor"; }; } diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix index b65a86a06b3a..2285d91e0399 100644 --- a/pkgs/tools/compression/xz/default.nix +++ b/pkgs/tools/compression/xz/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, lib}: -stdenv.mkDerivation { +stdenv.mkDerivation ({ name = "xz-4.999.9beta"; src = fetchurl { @@ -15,3 +15,11 @@ stdenv.mkDerivation { maintainers = [ lib.maintainers.sander ]; }; } + +// + +(if stdenv.system == "x86_64-darwin" + # Work around assembler misconfiguration as `x86'. This appears to be fixed + # by commit b9b5c54cd438b3ae47b44cc211b71f3bc53e35ef (Nov 22 12:00:30 2009 # +0200). + then { configureFlags = "--enable-assembler=x86_64"; } + else {})) |