mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
Code Issues Wiki Activity

same fix but now using stdenv.lib.optionals recommended by shlevy

Browse source 
svn path=/nixpkgs/trunk/; revision=26859
This commit is contained in:
Joachim Schiele 2011-04-16 23:00:47 +00:00
parent ece5a6bfc7
commit 0686dd5767
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/development/libraries/libx86/default.nix
View file

@ -14,12 +14,12 @@ rec {
phaseNames = ["doPatch" "fixX86Def" "killUsr" "doMakeInstall"]; phaseNames = ["doPatch" "fixX86Def" "killUsr" "doMakeInstall"];
patches = [./constants.patch]; patches = [./constants.patch];
# fixes http://www.mail-archive.com/suspend-devel@lists.sourceforge.net/msg02355.html # using BACKEND=x86emu on 64bit systems fixes:
my64bitFlags= if (a.stdenv.system == "x86_64-linux") then ["BACKEND=x86emu"] else [""]; # http://www.mail-archive.com/suspend-devel@lists.sourceforge.net/msg02355.html
makeFlags = [ makeFlags = [
"DESTDIR=$out" "DESTDIR=$out"
] ++ [my64bitFlags]; ] ++ a.stdenv.lib.optionals ( a.stdenv.system == "x86_64-linux" ) [ "BACKEND=x86emu" ];
fixX86Def = a.fullDepEntry ('' fixX86Def = a.fullDepEntry (''
sed -i lrmi.c -e 's@defined(__i386__)@(defined(__i386__) || defined(__x86_64__))@' sed -i lrmi.c -e 's@defined(__i386__)@(defined(__i386__) || defined(__x86_64__))@'
'') ["doUnpack" "minInit"]; '') ["doUnpack" "minInit"];