From 7aa65babe8644482be49c9cc9c4598c7745e2d59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 18 Jun 2011 15:59:44 +0000 Subject: [PATCH] GNU MIG: Force a 32-bit build. svn path=/nixpkgs/trunk/; revision=27493 --- pkgs/top-level/all-packages.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e7594c691c56..1dc65bcd55a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2729,7 +2729,20 @@ let 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 { };