diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2010-04-01 14:52:14 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2010-04-01 14:52:14 +0000 |
| commit | 525274bd94091a52e785fc2162479040f068771c (patch) | |
| tree | 4ce7ba434174264b15e66bf96061f0948a242c04 | |
| parent | 4597b33ed18ff10f1be5ffc39c19d4daed664940 (diff) | |
| download | nixlib-525274bd94091a52e785fc2162479040f068771c.tar nixlib-525274bd94091a52e785fc2162479040f068771c.tar.gz nixlib-525274bd94091a52e785fc2162479040f068771c.tar.bz2 nixlib-525274bd94091a52e785fc2162479040f068771c.tar.lz nixlib-525274bd94091a52e785fc2162479040f068771c.tar.xz nixlib-525274bd94091a52e785fc2162479040f068771c.tar.zst nixlib-525274bd94091a52e785fc2162479040f068771c.zip | |
xz: Fix x86_64-darwin builds.
svn path=/nixpkgs/trunk/; revision=20916
| -rw-r--r-- | pkgs/tools/compression/xz/default.nix | 10 |
1 files changed, 9 insertions, 1 deletions
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 {})) |