Author: raskin
Date: Wed Nov 10 17:32:08 2010
New Revision: 24648
URL: https://svn.nixos.org/websvn/nix/?rev=24648&sc=1
Log:
amd64 is still x86
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 Wed Nov 10
17:18:51 2010 (r24647)
+++ nixpkgs/trunk/pkgs/development/libraries/libx86/default.nix Wed Nov 10
17:32:08 2010 (r24648)
@@ -11,11 +11,14 @@
inherit (s) name;
inherit buildInputs;
- phaseNames = ["doPatch" "killUsr" "doMakeInstall"];
+ phaseNames = ["doPatch" "fixX86Def" "killUsr" "doMakeInstall"];
patches = [./constants.patch];
makeFlags = [
"DESTDIR=$out"
];
+ fixX86Def = a.fullDepEntry (''
+ sed -i lrmi.c -e 's...@defined(__i386__)@(defined(__i386__) ||
defined(__x86_64__))@'
+ '') ["doUnpack" "minInit"];
killUsr = a.fullDepEntry (''
sed -e s@/usr@@ -i Makefile
'') ["doUnpack" "minInit"];
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
