From ece5a6bfc722950ce3518fdd10660a34b41cef7e Mon Sep 17 00:00:00 2001 From: Joachim Schiele Date: Sat, 16 Apr 2011 22:47:15 +0000 Subject: fixes this bug http://www.mail-archive.com/suspend-devel@lists.sourceforge.net/msg02355.html svn path=/nixpkgs/trunk/; revision=26858 --- pkgs/development/libraries/libx86/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'pkgs/development') diff --git a/pkgs/development/libraries/libx86/default.nix b/pkgs/development/libraries/libx86/default.nix index 1ad967c25a2..6696c6f3fed 100644 --- a/pkgs/development/libraries/libx86/default.nix +++ b/pkgs/development/libraries/libx86/default.nix @@ -13,9 +13,13 @@ rec { phaseNames = ["doPatch" "fixX86Def" "killUsr" "doMakeInstall"]; patches = [./constants.patch]; + + # fixes http://www.mail-archive.com/suspend-devel@lists.sourceforge.net/msg02355.html + my64bitFlags= if (a.stdenv.system == "x86_64-linux") then ["BACKEND=x86emu"] else [""]; + makeFlags = [ "DESTDIR=$out" - ]; + ] ++ [my64bitFlags]; fixX86Def = a.fullDepEntry ('' sed -i lrmi.c -e 's@defined(__i386__)@(defined(__i386__) || defined(__x86_64__))@' '') ["doUnpack" "minInit"]; -- cgit 1.4.1