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/generic | |
| parent | f878980c8b78a639b3feabd1f8f9ed9f1b7c388c (diff) | |
| parent | d9de74edd67f7dc31f5297bc785712afb322dbdd (diff) | |
| download | nixpkgs-5b132f6e96a9794018ae1c085da482b381d1e039.tar nixpkgs-5b132f6e96a9794018ae1c085da482b381d1e039.tar.gz nixpkgs-5b132f6e96a9794018ae1c085da482b381d1e039.tar.bz2 nixpkgs-5b132f6e96a9794018ae1c085da482b381d1e039.tar.lz nixpkgs-5b132f6e96a9794018ae1c085da482b381d1e039.tar.xz nixpkgs-5b132f6e96a9794018ae1c085da482b381d1e039.tar.zst nixpkgs-5b132f6e96a9794018ae1c085da482b381d1e039.zip | |
svn merge ^/nixpkgs/trunk
Conflicts: cups, all-packages.nix (gcc45_debug) svn path=/nixpkgs/branches/stdenv-updates/; revision=31863
Diffstat (limited to 'pkgs/stdenv/generic')
| -rw-r--r-- | pkgs/stdenv/generic/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index a20ebda4bad..f2abf294de1 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 |