From 650380ca0b1509cff4ec1ba4daa78357388fecee Mon Sep 17 00:00:00 2001 From: John Ericson Date: Fri, 29 Jul 2022 18:34:02 -0400 Subject: [PATCH] stdenv: Simplify dispatch This is a change for `powerpc-linux` but that is ancient and I don't think it matters. The impure bootstrap that was previously assigned to it has probably bitrotted anyways. --- pkgs/stdenv/default.nix | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix index 25a593c67437..7a2ad665e09d 100644 --- a/pkgs/stdenv/default.nix +++ b/pkgs/stdenv/default.nix @@ -38,28 +38,10 @@ let in if crossSystem != localSystem || crossOverlays != [] then stagesCross else if config ? replaceStdenv then stagesCustom - else { # switch - i686-linux = stagesLinux; - x86_64-linux = stagesLinux; - armv5tel-linux = stagesLinux; - armv6l-linux = stagesLinux; - armv6m-linux = stagesLinux; - armv7a-linux = stagesLinux; - armv7l-linux = stagesLinux; - armv7r-linux = stagesLinux; - armv7m-linux = stagesLinux; - armv8a-linux = stagesLinux; - armv8r-linux = stagesLinux; - armv8m-linux = stagesLinux; - aarch64-linux = stagesLinux; - mipsel-linux = stagesLinux; - mips64el-linux = stagesLinux; - powerpc-linux = /* stagesLinux */ stagesNative; - powerpc64-linux = stagesLinux; - powerpc64le-linux = stagesLinux; - riscv64-linux = stagesLinux; - x86_64-darwin = stagesDarwin; - aarch64-darwin = stagesDarwin; + else if localSystem.isLinux then stagesLinux + else if localSystem.isDarwin then stagesDarwin + else # misc special cases + { # switch x86_64-solaris = stagesNix; i686-cygwin = stagesNative; x86_64-cygwin = stagesNative;