diff options
| author | Joachim Schiele <js@lastlog.de> | 2011-04-16 22:47:15 +0000 |
|---|---|---|
| committer | Joachim Schiele <js@lastlog.de> | 2011-04-16 22:47:15 +0000 |
| commit | ece5a6bfc722950ce3518fdd10660a34b41cef7e (patch) | |
| tree | 9156d5c915fab37955d9e13ef65f854320be08ab /pkgs/development/libraries/libx86 | |
| parent | a42b81d33d2d35b6b2b9c7a48676f5c7104be16e (diff) | |
| download | nixpkgs-ece5a6bfc722950ce3518fdd10660a34b41cef7e.tar nixpkgs-ece5a6bfc722950ce3518fdd10660a34b41cef7e.tar.gz nixpkgs-ece5a6bfc722950ce3518fdd10660a34b41cef7e.tar.bz2 nixpkgs-ece5a6bfc722950ce3518fdd10660a34b41cef7e.tar.lz nixpkgs-ece5a6bfc722950ce3518fdd10660a34b41cef7e.tar.xz nixpkgs-ece5a6bfc722950ce3518fdd10660a34b41cef7e.tar.zst nixpkgs-ece5a6bfc722950ce3518fdd10660a34b41cef7e.zip | |
fixes this bug http://www.mail-archive.com/suspend-devel@lists.sourceforge.net/msg02355.html
svn path=/nixpkgs/trunk/; revision=26858
Diffstat (limited to 'pkgs/development/libraries/libx86')
| -rw-r--r-- | pkgs/development/libraries/libx86/default.nix | 6 |
1 files changed, 5 insertions, 1 deletions
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"]; |