diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2010-11-10 17:32:08 +0000 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2010-11-10 17:32:08 +0000 |
| commit | df168884a02b37b9de4e049d4337ed61fb9fe8f5 (patch) | |
| tree | 84289eac54c00b9323d8c7c1be504f4157da2af2 /pkgs/development/libraries/libx86 | |
| parent | 477bb198c772547e04662d57ff8c0b0a884c697f (diff) | |
| download | nixpkgs-df168884a02b37b9de4e049d4337ed61fb9fe8f5.tar nixpkgs-df168884a02b37b9de4e049d4337ed61fb9fe8f5.tar.gz nixpkgs-df168884a02b37b9de4e049d4337ed61fb9fe8f5.tar.bz2 nixpkgs-df168884a02b37b9de4e049d4337ed61fb9fe8f5.tar.lz nixpkgs-df168884a02b37b9de4e049d4337ed61fb9fe8f5.tar.xz nixpkgs-df168884a02b37b9de4e049d4337ed61fb9fe8f5.tar.zst nixpkgs-df168884a02b37b9de4e049d4337ed61fb9fe8f5.zip | |
amd64 is still x86
svn path=/nixpkgs/trunk/; revision=24648
Diffstat (limited to 'pkgs/development/libraries/libx86')
| -rw-r--r-- | pkgs/development/libraries/libx86/default.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/development/libraries/libx86/default.nix b/pkgs/development/libraries/libx86/default.nix index 05251d2ebfe..1ad967c25a2 100644 --- a/pkgs/development/libraries/libx86/default.nix +++ b/pkgs/development/libraries/libx86/default.nix @@ -11,11 +11,14 @@ rec { 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"]; |