diff options
| author | Joachim Schiele <js@lastlog.de> | 2011-04-16 23:00:47 +0000 |
|---|---|---|
| committer | Joachim Schiele <js@lastlog.de> | 2011-04-16 23:00:47 +0000 |
| commit | 0686dd57677db29b7b0ce197b25a71c7fbe32d56 (patch) | |
| tree | 3cc126d5fa3a63fedfccc9a7e1e67aa1a8150bef /pkgs/development | |
| parent | ece5a6bfc722950ce3518fdd10660a34b41cef7e (diff) | |
| download | nixlib-0686dd57677db29b7b0ce197b25a71c7fbe32d56.tar nixlib-0686dd57677db29b7b0ce197b25a71c7fbe32d56.tar.gz nixlib-0686dd57677db29b7b0ce197b25a71c7fbe32d56.tar.bz2 nixlib-0686dd57677db29b7b0ce197b25a71c7fbe32d56.tar.lz nixlib-0686dd57677db29b7b0ce197b25a71c7fbe32d56.tar.xz nixlib-0686dd57677db29b7b0ce197b25a71c7fbe32d56.tar.zst nixlib-0686dd57677db29b7b0ce197b25a71c7fbe32d56.zip | |
same fix but now using stdenv.lib.optionals recommended by shlevy
svn path=/nixpkgs/trunk/; revision=26859
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/libx86/default.nix | 8 |
1 files 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"]; |