Author: qknight Date: Sat Apr 16 23:00:47 2011 New Revision: 26859 URL: https://svn.nixos.org/websvn/nix/?rev=26859&sc=1
Log: same fix but now using stdenv.lib.optionals recommended by shlevy Modified: nixpkgs/trunk/pkgs/development/libraries/libx86/default.nix Modified: nixpkgs/trunk/pkgs/development/libraries/libx86/default.nix ============================================================================== --- nixpkgs/trunk/pkgs/development/libraries/libx86/default.nix Sat Apr 16 22:47:15 2011 (r26858) +++ nixpkgs/trunk/pkgs/development/libraries/libx86/default.nix Sat Apr 16 23:00:47 2011 (r26859) @@ -14,12 +14,12 @@ 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"]; _______________________________________________ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits
