Author: ludo
Date: Sat Jun 18 15:59:44 2011
New Revision: 27493
URL: https://svn.nixos.org/websvn/nix/?rev=27493&sc=1
Log:
GNU MIG: Force a 32-bit build.
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Jun 18 12:31:16
2011 (r27492)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Jun 18 15:59:44
2011 (r27493)
@@ -2729,7 +2729,20 @@
ltrace = callPackage ../development/tools/misc/ltrace { };
- mig = callPackage ../os-specific/gnu/mig { };
+ mig = callPackage ../os-specific/gnu/mig
+ (if stdenv.isLinux
+ then {
+ # Build natively, but force use of a 32-bit environment because we're
+ # targeting `i586-pc-gnu'.
+ stdenv = (import ../stdenv {
+ system = "i686-linux";
+ stdenvType = "i686-linux";
+ allPackages = args:
+ import ./all-packages.nix ({ inherit config; } // args);
+ inherit platform;
+ }).stdenv;
+ }
+ else { });
mk = callPackage ../development/tools/build-managers/mk { };
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
