diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-26 08:45:19 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-26 08:45:19 +0000 |
| commit | 2ced89b7f14a817d0507747efa22bedaec10e423 (patch) | |
| tree | 84a7421d43e02c590b7828d0ab34f1b8e2b1fab5 /pkgs/os-specific/linux/kernel/generic.nix | |
| parent | b1762c6b49f7fb6469a71e1b59b1f96fcc4dfef2 (diff) | |
| parent | ecea8900e7f7278b58d7604aa8a3d5a7ba65bc8f (diff) | |
| download | nixlib-2ced89b7f14a817d0507747efa22bedaec10e423.tar nixlib-2ced89b7f14a817d0507747efa22bedaec10e423.tar.gz nixlib-2ced89b7f14a817d0507747efa22bedaec10e423.tar.bz2 nixlib-2ced89b7f14a817d0507747efa22bedaec10e423.tar.lz nixlib-2ced89b7f14a817d0507747efa22bedaec10e423.tar.xz nixlib-2ced89b7f14a817d0507747efa22bedaec10e423.tar.zst nixlib-2ced89b7f14a817d0507747efa22bedaec10e423.zip | |
svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=31846
Diffstat (limited to 'pkgs/os-specific/linux/kernel/generic.nix')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/generic.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index dbfdf86f9c96..223a38da54e7 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -46,7 +46,7 @@ }: assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" - || stdenv.system == "armv5tel-linux" || stdenv.system == "mips64-linux"; + || stdenv.system == "armv5tel-linux" || stdenv.system == "mips64el-linux"; assert stdenv.platform.name == "sheevaplug" -> stdenv.platform.uboot != null; @@ -102,7 +102,7 @@ stdenv.mkDerivation { if stdenv.system == "i686-linux" then "i386" else if stdenv.system == "x86_64-linux" then "x86_64" else if stdenv.system == "armv5tel-linux" then "arm" else - if stdenv.system == "mips64-linux" then "mips" else + if stdenv.system == "mips64el-linux" then "mips" else abort "Platform ${stdenv.system} is not supported."; crossAttrs = let |