diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-06-30 13:31:08 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-06-30 13:31:08 +0200 |
commit | 47075812ce0ca06e647ca8d2ab439dce060055a2 (patch) | |
tree | 19c8d10a2b0882c2004237a0f0bbc07883b930e3 /pkgs/stdenv/default.nix | |
parent | 6303278ad3acb3cfe81d2a6960901d09b70c886c (diff) | |
download | nixlib-47075812ce0ca06e647ca8d2ab439dce060055a2.tar nixlib-47075812ce0ca06e647ca8d2ab439dce060055a2.tar.gz nixlib-47075812ce0ca06e647ca8d2ab439dce060055a2.tar.bz2 nixlib-47075812ce0ca06e647ca8d2ab439dce060055a2.tar.lz nixlib-47075812ce0ca06e647ca8d2ab439dce060055a2.tar.xz nixlib-47075812ce0ca06e647ca8d2ab439dce060055a2.tar.zst nixlib-47075812ce0ca06e647ca8d2ab439dce060055a2.zip |
Remove the unmaintained (and AFAIK unused) stdenv for mingw
Diffstat (limited to 'pkgs/stdenv/default.nix')
-rw-r--r-- | pkgs/stdenv/default.nix | 34 |
1 files changed, 10 insertions, 24 deletions
diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix index a2723f5575c0..47d1fb6d9f75 100644 --- a/pkgs/stdenv/default.nix +++ b/pkgs/stdenv/default.nix @@ -5,14 +5,7 @@ # Posix utilities, the GNU C compiler, and so on. On other systems, # we use the native C library. - -# stdenvType exists to support multiple kinds of stdenvs on the same -# system, e.g., cygwin and mingw builds on i686-cygwin. Most people -# can ignore it. - -{ system, stdenvType ? system, allPackages ? import ../.., platform, config }: - -assert system != "i686-cygwin" -> system == stdenvType; +{ system, allPackages ? import ../.., platform, config }: rec { @@ -45,23 +38,16 @@ rec { stdenvLinux = (import ./linux { inherit system allPackages platform config;}).stdenvLinux; - # MinGW/MSYS standard environment. - stdenvMinGW = import ./mingw { - inherit system; - }; - - # Select the appropriate stdenv for the platform `system'. stdenv = - if stdenvType == "i686-linux" then stdenvLinux else - if stdenvType == "x86_64-linux" then stdenvLinux else - if stdenvType == "armv5tel-linux" then stdenvLinux else - if stdenvType == "armv6l-linux" then stdenvLinux else - if stdenvType == "armv7l-linux" then stdenvLinux else - if stdenvType == "mips64el-linux" then stdenvLinux else - if stdenvType == "powerpc-linux" then /* stdenvLinux */ stdenvNative else - if stdenvType == "i686-mingw" then stdenvMinGW else - if stdenvType == "x86_64-darwin" then stdenvNix else - if stdenvType == "x86_64-solaris" then stdenvNix else + if system == "i686-linux" then stdenvLinux else + if system == "x86_64-linux" then stdenvLinux else + if system == "armv5tel-linux" then stdenvLinux else + if system == "armv6l-linux" then stdenvLinux else + if system == "armv7l-linux" then stdenvLinux else + if system == "mips64el-linux" then stdenvLinux else + if system == "powerpc-linux" then /* stdenvLinux */ stdenvNative else + if system == "x86_64-darwin" then stdenvNix else + if system == "x86_64-solaris" then stdenvNix else stdenvNative; } |