From df168884a02b37b9de4e049d4337ed61fb9fe8f5 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 10 Nov 2010 17:32:08 +0000
Subject: [PATCH] amd64 is still x86

svn path=/nixpkgs/trunk/; revision=24648
---
 pkgs/development/libraries/libx86/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libx86/default.nix b/pkgs/development/libraries/libx86/default.nix
index 05251d2ebfe9..1ad967c25a26 100644
--- a/pkgs/development/libraries/libx86/default.nix
+++ b/pkgs/development/libraries/libx86/default.nix
@@ -11,11 +11,14 @@ rec {
   inherit (s) name;
   inherit buildInputs;
 
-  phaseNames = ["doPatch" "killUsr" "doMakeInstall"];
+  phaseNames = ["doPatch" "fixX86Def" "killUsr" "doMakeInstall"];
   patches = [./constants.patch];
   makeFlags = [
     "DESTDIR=$out"
     ];
+  fixX86Def = a.fullDepEntry (''
+    sed -i lrmi.c -e 's@defined(__i386__)@(defined(__i386__) || defined(__x86_64__))@'
+  '') ["doUnpack" "minInit"];
   killUsr = a.fullDepEntry (''
     sed -e s@/usr@@ -i Makefile
   '') ["doUnpack" "minInit"];