public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

amd64 is still x86

Browse Source 
svn path=/nixpkgs/trunk/; revision=24648
This commit is contained in:
Michael Raskin 2010-11-10 17:32:08 +00:00
parent 477bb198c7
commit df168884a0
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/libraries/libx86/default.nix
View File

@ -11,11 +11,14 @@ rec {
inherit (s) name; inherit (s) name;
inherit buildInputs; inherit buildInputs;
phaseNames = ["doPatch" "killUsr" "doMakeInstall"]; phaseNames = ["doPatch" "fixX86Def" "killUsr" "doMakeInstall"];
patches = [./constants.patch]; patches = [./constants.patch];
makeFlags = [ makeFlags = [
"DESTDIR=$out" "DESTDIR=$out"
]; ];
fixX86Def = a.fullDepEntry (''
sed -i lrmi.c -e 's@defined(__i386__)@(defined(__i386__) || defined(__x86_64__))@'
'') ["doUnpack" "minInit"];
killUsr = a.fullDepEntry ('' killUsr = a.fullDepEntry (''
sed -e s@/usr@@ -i Makefile sed -e s@/usr@@ -i Makefile
'') ["doUnpack" "minInit"]; '') ["doUnpack" "minInit"];