diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-26 15:27:03 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-26 15:27:03 +0000 |
| commit | 5b132f6e96a9794018ae1c085da482b381d1e039 (patch) | |
| tree | ff54ae514799540c093adcfeca0d501b75cde506 /pkgs/stdenv | |
| parent | f878980c8b78a639b3feabd1f8f9ed9f1b7c388c (diff) | |
| parent | d9de74edd67f7dc31f5297bc785712afb322dbdd (diff) | |
svn merge ^/nixpkgs/trunk
Conflicts: cups, all-packages.nix (gcc45_debug) svn path=/nixpkgs/branches/stdenv-updates/; revision=31863
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/stdenv/generic/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/stdenv/linux/default.nix | 4 |
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 a20ebda4bad47..f2abf294de13d 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -93,7 +93,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"; @@ -117,7 +117,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 4a63d0bf95a21..8b6599e6bc034 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -16,7 +16,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"; @@ -25,7 +25,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 ""} ''; |