public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merging from trunk.

Browse Source 
I hope I resolved the conflicts well (gmp and gccCross)


svn path=/nixpkgs/branches/stdenv-updates/; revision=21251
This commit is contained in:
Lluís Batlle i Rossell
2010-04-22 21:44:33 +00:00
parent 6d62947d71 93d2b4b7bf
commit 6f2fac6466
413 changed files with 119110 additions and 6314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/tools/compression/ncompress/default.nix
View File

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

10
pkgs/tools/compression/xz/default.nix
View File

@@ -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 {}))