about summary refs log tree commit diff
path: root/pkgs/stdenv
diff options
context:
space:
mode:
authorLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2012-01-21 00:34:51 +0000
committerLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2012-01-21 00:34:51 +0000
commit4a1c721c01367307c28401f142d4149a53e062e4 (patch)
tree255745d7c7bc9865e89a66dd86957d4af0a0f906 /pkgs/stdenv
parente6c1aa2005a35b415cfb0c6604a087bb99ec4368 (diff)
Changing every reference from mips64-linux to mips64el-linux. That's
what the new nix thinks the fuloong is.

Anyone having the old nix should use a nixpkgs previous to this change to build
the new nix. And then, with the new nix, he can use any newer nixpkgs revision.

svn path=/nixpkgs/trunk/; revision=31751
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r--pkgs/stdenv/default.nix2
-rw-r--r--pkgs/stdenv/generic/default.nix4
-rw-r--r--pkgs/stdenv/linux/default.nix4
3 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix
index 11af6d371cdcb..03f14d6d57b2f 100644
--- a/pkgs/stdenv/default.nix
+++ b/pkgs/stdenv/default.nix
@@ -55,7 +55,7 @@ rec {
     if stdenvType == "i686-linux" then stdenvLinux else
     if stdenvType == "x86_64-linux" then stdenvLinux else
     if stdenvType == "armv5tel-linux" then stdenvLinux else
-    if stdenvType == "mips64-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 == "i686-darwin" then stdenvNix else
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 436b912d8d6f5..6ffdaa91c62df 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -97,7 +97,7 @@ let
                || result.system == "x86_64-linux"
                || result.system == "powerpc-linux"
                || result.system == "armv5tel-linux"
-               || result.system == "mips64-linux";
+               || result.system == "mips64el-linux";
         isSunOS = result.system == "i686-solaris"
                || result.system == "x86_64-solaris";
         isCygwin = result.system == "i686-cygwin";
@@ -121,7 +121,7 @@ let
         is64bit = result.system == "x86_64-linux"
                 || result.system == "x86_64-darwin";
         isMips = result.system == "mips-linux"
-                || result.system == "mips64-linux";
+                || result.system == "mips64el-linux";
         isArm = result.system == "armv5tel-linux";
 
         # Utility function: allow stdenv to be easily regenerated with
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 7e0116e342c74..91a9689e8fb32 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -14,7 +14,7 @@ rec {
     else if system == "x86_64-linux" then import ./bootstrap/x86_64
     else if system == "powerpc-linux" then import ./bootstrap/powerpc
     else if system == "armv5tel-linux" then import ./bootstrap/armv5tel
-    else if system == "mips64-linux" then import ./bootstrap/loongson2f
+    else if system == "mips64el-linux" then import ./bootstrap/loongson2f
     else abort "unsupported platform for the pure Linux stdenv";
 
 
@@ -23,7 +23,7 @@ rec {
       export NIX_ENFORCE_PURITY=1
       havePatchELF=1
       ${if system == "x86_64-linux" then "NIX_LIB64_IN_SELF_RPATH=1" else ""}
-      ${if system == "mips64-linux" then "NIX_LIB32_IN_SELF_RPATH=1" else ""}
+      ${if system == "mips64el-linux" then "NIX_LIB32_IN_SELF_RPATH=1" else ""}
     '';