Merge pull request #43079 from matthewbauer/rework-extra-pkgs

Rework stage.nix's extraPkgs

pkgs/os-specific/gnu/default.nix

@@ -3,7 +3,7 @@
 args@{ fetchgit, stdenv, autoconf, automake, automake111x, libtool
 , texinfo, glibcCross, hurdPartedCross, libuuid, samba
 , gccCrossStageStatic, gcc
-, forceSystem, newScope, platform, config
+, pkgsi686Linux, newScope, platform, config
 , targetPlatform, buildPlatform
 , overrides ? {}
 , buildPackages, pkgs
@@ -90,7 +90,7 @@ let
     mig = callPackage ./mig {
       # Build natively, but force use of a 32-bit environment because we're
       # targeting `i586-pc-gnu'.
-      stdenv = (forceSystem "i686-linux" "i386").stdenv;
+      stdenv = pkgsi686Linux.stdenv;
     };
 
     # XXX: Use this one for its `.crossDrv'.  Using the one above from

pkgs/os-specific/linux/nvidia-x11/generic.nix

@@ -12,7 +12,7 @@
 , patches ? []
 }:
 
-{ stdenv, callPackage, callPackage_i686, fetchurl, fetchpatch
+{ stdenv, callPackage, pkgsi686Linux, fetchurl, fetchpatch
 , kernel ? null, xorg, zlib, perl, nukeReferences
 , # Whether to build the libraries only (i.e. not the kernel module or
   # nvidia-settings).  Used to support 32-bit binaries on 64-bit
@@ -70,7 +70,7 @@ let
     disallowedReferences = optional (!libsOnly) [ kernel.dev ];
 
     passthru = {
-      settings = (if settings32Bit then callPackage_i686 else callPackage) (import ./settings.nix self settingsSha256) {
+      settings = (if settings32Bit then pkgsi686Linux.callPackage else callPackage) (import ./settings.nix self settingsSha256) {
         withGtk2 = preferGtk2;
         withGtk3 = !preferGtk2;
       };