From 525274bd94091a52e785fc2162479040f068771c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 1 Apr 2010 14:52:14 +0000
Subject: [PATCH] xz: Fix x86_64-darwin builds.

svn path=/nixpkgs/trunk/; revision=20916
---
 pkgs/tools/compression/xz/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix
index b65a86a06b3..2285d91e039 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 {}))