diff options
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r-- | pkgs/stdenv/adapters.nix | 4 | ||||
-rw-r--r-- | pkgs/stdenv/cross/default.nix | 4 | ||||
-rw-r--r-- | pkgs/stdenv/default.nix | 2 | ||||
-rw-r--r-- | pkgs/stdenv/linux/default.nix | 4 |
4 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 3090b6283e93..0791d9e18568 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -94,7 +94,9 @@ rec { # without proper `file` command, libtool sometimes fails # to recognize 64-bit DLLs ++ stdenv.lib.optional (hostPlatform.config == "x86_64-w64-mingw32") pkgs.file - ++ stdenv.lib.optional (hostPlatform.isAarch64 || hostPlatform.libc == "musl") pkgs.updateAutotoolsGnuConfigScriptsHook + ++ stdenv.lib.optional + (hostPlatform.isAarch64 || hostPlatform.isMips || hostPlatform.libc == "musl") + pkgs.updateAutotoolsGnuConfigScriptsHook ; crossConfig = hostPlatform.config; diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index 8197510eeecc..8da3555c6c60 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -34,7 +34,9 @@ in bootStages ++ [ hostPlatform = crossSystem; targetPlatform = crossSystem; cc = if crossSystem.useiOSCross or false - then buildPackages.darwin.ios-cross + then buildPackages.darwin.ios-cross + else if crossSystem.useAndroidPrebuilt + then buildPackages.androidenv.androidndkPkgs.gcc else buildPackages.gcc; }; }) diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix index 098caca0d890..203cf5459400 100644 --- a/pkgs/stdenv/default.nix +++ b/pkgs/stdenv/default.nix @@ -45,7 +45,7 @@ in "armv6l-linux" = stagesLinux; "armv7l-linux" = stagesLinux; "aarch64-linux" = stagesLinux; - "mips64el-linux" = stagesLinux; + "mipsel-linux" = stagesLinux; "powerpc-linux" = /* stagesLinux */ stagesNative; "x86_64-darwin" = stagesDarwin; "x86_64-solaris" = stagesNix; diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 703800deb2ad..9e19d199a5da 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -15,7 +15,7 @@ "armv6l-linux" = import ./bootstrap-files/armv6l.nix; "armv7l-linux" = import ./bootstrap-files/armv7l.nix; "aarch64-linux" = import ./bootstrap-files/aarch64.nix; - "mips64el-linux" = import ./bootstrap-files/loongson2f.nix; + "mipsel-linux" = import ./bootstrap-files/loongson2f.nix; }; "musl" = { "aarch64-linux" = import ./bootstrap-files/aarch64-musl.nix; @@ -40,7 +40,7 @@ let export NIX_ENFORCE_PURITY="''${NIX_ENFORCE_PURITY-1}" export NIX_ENFORCE_NO_NATIVE="''${NIX_ENFORCE_NO_NATIVE-1}" ${if system == "x86_64-linux" then "NIX_LIB64_IN_SELF_RPATH=1" else ""} - ${if system == "mips64el-linux" then "NIX_LIB32_IN_SELF_RPATH=1" else ""} + ${if system == "mipsel-linux" then "NIX_LIB32_IN_SELF_RPATH=1" else ""} ''; |