diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-07-05 15:47:10 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-07-05 15:47:10 -0400 |
| commit | 69f1045001a32a45de891f3c2264d09b1955a7f2 (patch) | |
| tree | 10e0b3a30313668c1a0ae6797d784f9a0b9475b5 /pkgs/os-specific | |
| parent | c491a99362af31a53d9be6220e268d5b594bae29 (diff) | |
| download | nixlib-69f1045001a32a45de891f3c2264d09b1955a7f2.tar nixlib-69f1045001a32a45de891f3c2264d09b1955a7f2.tar.gz nixlib-69f1045001a32a45de891f3c2264d09b1955a7f2.tar.bz2 nixlib-69f1045001a32a45de891f3c2264d09b1955a7f2.tar.lz nixlib-69f1045001a32a45de891f3c2264d09b1955a7f2.tar.xz nixlib-69f1045001a32a45de891f3c2264d09b1955a7f2.tar.zst nixlib-69f1045001a32a45de891f3c2264d09b1955a7f2.zip | |
treewide: remove forceSystem
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/gnu/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/os-specific/gnu/default.nix b/pkgs/os-specific/gnu/default.nix index 478040132b82..5dc52c766f18 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 , 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 |