From 0686dd57677db29b7b0ce197b25a71c7fbe32d56 Mon Sep 17 00:00:00 2001
From: Joachim Schiele <js@lastlog.de>
Date: Sat, 16 Apr 2011 23:00:47 +0000
Subject: [PATCH] same fix but now using stdenv.lib.optionals recommended by
shlevy
svn path=/nixpkgs/trunk/; revision=26859
---
pkgs/development/libraries/libx86/default.nix | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pkgs/development/libraries/libx86/default.nix b/pkgs/development/libraries/libx86/default.nix
index 6696c6f3fed4..09cc623cbb19 100644
--- a/pkgs/development/libraries/libx86/default.nix
+++ b/pkgs/development/libraries/libx86/default.nix
@@ -14,12 +14,12 @@ 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 [""];
-
+ # using BACKEND=x86emu on 64bit systems fixes:
+ # http://www.mail-archive.com/suspend-devel@lists.sourceforge.net/msg02355.html
makeFlags = [
"DESTDIR=$out"
- ] ++ [my64bitFlags];
+ ] ++ a.stdenv.lib.optionals ( a.stdenv.system == "x86_64-linux" ) [ "BACKEND=x86emu" ];
+
fixX86Def = a.fullDepEntry (''
sed -i lrmi.c -e 's@defined(__i386__)@(defined(__i386__) || defined(__x86_64__))@'
'') ["doUnpack" "minInit"];