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/lib | |
parent | f878980c8b78a639b3feabd1f8f9ed9f1b7c388c (diff) | |
parent | d9de74edd67f7dc31f5297bc785712afb322dbdd (diff) | |
download | nixlib-5b132f6e96a9794018ae1c085da482b381d1e039.tar nixlib-5b132f6e96a9794018ae1c085da482b381d1e039.tar.gz nixlib-5b132f6e96a9794018ae1c085da482b381d1e039.tar.bz2 nixlib-5b132f6e96a9794018ae1c085da482b381d1e039.tar.lz nixlib-5b132f6e96a9794018ae1c085da482b381d1e039.tar.xz nixlib-5b132f6e96a9794018ae1c085da482b381d1e039.tar.zst nixlib-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/lib')
-rw-r--r-- | pkgs/lib/platforms.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/lib/platforms.nix b/pkgs/lib/platforms.nix index 19ceb16fcff5..c10d0e63a97a 100644 --- a/pkgs/lib/platforms.nix +++ b/pkgs/lib/platforms.nix @@ -3,7 +3,7 @@ let lists = import ./lists.nix; in rec { gnu = linux; /* ++ hurd ++ kfreebsd ++ ... */ linux = ["i686-linux" "x86_64-linux" "powerpc-linux" "armv5tel-linux" - "mips64-linux"]; + "mips64el-linux"]; darwin = ["i686-darwin" "powerpc-darwin" "x86_64-darwin"]; freebsd = ["i686-freebsd" "x86_64-freebsd" "powerpc-freebsd"]; openbsd = ["i686-openbsd" "x86_64-openbsd"]; |