From 97bd4b7b004347dca31e141ebe9c5ba89859586a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 15 Mar 2012 20:27:53 +0000
Subject: [PATCH] GNU MIG: Use `forceSystem' instead of the custom hack.

svn path=/nixpkgs/trunk/; revision=33121
---
 pkgs/os-specific/gnu/default.nix | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/pkgs/os-specific/gnu/default.nix b/pkgs/os-specific/gnu/default.nix
index a16aeb1c06c..5b8309f1c52 100644
--- a/pkgs/os-specific/gnu/default.nix
+++ b/pkgs/os-specific/gnu/default.nix
@@ -3,7 +3,7 @@
 args@{ fetchgit, stdenv, autoconf, automake, automake111x, libtool
 , texinfo, glibcCross, hurdPartedCross, libuuid, samba_light
 , gccCrossStageStatic, gccCrossStageFinal
-, forceBuildDrv, callPackage, platform, config, crossSystem }:
+, forceBuildDrv, forceSystem, callPackage, platform, config, crossSystem }:
 
 with args;
 
@@ -72,20 +72,11 @@ rec {
     mig = null;
   };
 
-  mig = callPackage ./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 ../../top-level/all-packages.nix ({ inherit config; } // args);
-         inherit platform;
-       }).stdenv;
-     }
-     else { });
+  mig = callPackage ./mig {
+    # Build natively, but force use of a 32-bit environment because we're
+    # targeting `i586-pc-gnu'.
+    stdenv = (forceSystem "i686-linux").stdenv;
+  };
 
   smbfs = callPackage ./smbfs {
     samba = samba_light;