pkgsi686Linux: Use 32b kernels (x86_64 kernels can't be built with 32b gcc).

This commit is contained in:
Petr Rockai 2014-02-22 15:56:59 +01:00 committed by Eelco Dolstra
parent f5d0d8dbf1
commit bde992bbbc

View File

@ -153,15 +153,16 @@ let
# Override system. This is useful to build i686 packages on x86_64-linux. # Override system. This is useful to build i686 packages on x86_64-linux.
forceSystem = system: (import ./all-packages.nix) { forceSystem = system: kernel: (import ./all-packages.nix) {
inherit system; inherit system;
platform = platform // { kernelArch = kernel; };
inherit bootStdenv noSysDirs gccWithCC gccWithProfiling config inherit bootStdenv noSysDirs gccWithCC gccWithProfiling config
crossSystem platform; crossSystem;
}; };
# Used by wine, firefox with debugging version of Flash, ... # Used by wine, firefox with debugging version of Flash, ...
pkgsi686Linux = forceSystem "i686-linux"; pkgsi686Linux = forceSystem "i686-linux" "i386";
callPackage_i686 = lib.callPackageWith (pkgsi686Linux // pkgsi686Linux.xorg); callPackage_i686 = lib.callPackageWith (pkgsi686Linux // pkgsi686Linux.xorg);